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
..
environments
initializers	Introduce OAuth scopes for bookmarks	2018-08-10 15:26:52 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-10 16:22:31 +02:00
webpack	Reduce assets precompilation time by about 20%	2018-07-28 23:24:41 +02:00
application.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-26 21:22:43 +02:00
boot.rb
brakeman.ignore
database.yml
deploy.rb
environment.rb
i18n-tasks.yml
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-17 22:05:25 +02:00
puma.rb
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-10 16:22:31 +02:00
secrets.yml
settings.yml	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-01 22:20:25 +02:00
sidekiq.yml
webpacker.yml