Thibaut Girka e5a603206d Merge branch 'master' into glitch-soc/merge-upstream ... 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.		2018-08-10 16:22:31 +02:00
..
admin	…
settings	…
application_helper.rb	Add more granular OAuth scopes (#7929)	2018-07-05 18:31:35 +02:00
flashes_helper.rb	…
home_helper.rb	Public profile endorsements (accounts picked by profile owner) (#8146)	2018-08-09 09:56:53 +02:00
instance_helper.rb	…
jsonld_helper.rb	…
mailer_helper.rb	…
routing_helper.rb	…
settings_helper.rb	Weblate translations (2018-07-25) (#8065)	2018-07-24 20:47:13 +02:00
stream_entries_helper.rb	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00