mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-06 18:28:09 +00:00
Conflicts: app/controllers/accounts_controller.rb app/javascript/mastodon/locales/pl.json app/views/about/more.html.haml Conflicts in `accounts_controller.rb` resolved by taking upstream's version + our `use_pack`. Conflicts in `pl.json` resolved by taking upstream's changes. Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes. |
||
---|---|---|
.. | ||
show.html.haml_spec.rb |