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	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
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	Upgrade Rails to version 5.2.0 (#5898)	2018-04-12 14:45:17 +02:00
brakeman.ignore	Save video metadata and improve video OpenGraph tags (#6481)	2018-02-16 07:22:20 +01:00
database.yml	use-DB_NAME-in-development (#5430)	2017-10-17 11:45:37 +02:00
deploy.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	2017-09-01 16:20:16 +02:00
i18n-tasks.yml	Ignore tootsuite-specific theme-related translation strings	2018-05-10 00:03:34 +02:00
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	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
webpacker.yml	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00