Thibaut Girka 84a2587d44 Merge branch 'master' into glitch-soc/merge-upstream		2018-08-11 15:45:42 +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-11 15:45:42 +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
database.yml
deploy.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
environment.rb
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
webpacker.yml