Ondřej Hruška 3ea02314b9 split added glitch locales from vanilla (#82) ... * Locale script now accepts overrides and new keys from glitch/locales * Revert glitchsoc changes to mastodon/locales to prevent future merge conflicts		2017-07-16 01:15:25 +02:00
..
environments	Merge upstream (#81)	2017-07-15 14:33:15 -07:00
initializers	Improve ActivityPub representations (#3844)	2017-07-15 03:01:39 +02:00
locales	Improve ActivityPub representations (#3844)	2017-07-15 03:01:39 +02:00
webpack	split added glitch locales from vanilla (#82)	2017-07-16 01:15:25 +02:00
application.rb	Merge upstream!! #64 <3 <3	2017-07-12 02:03:17 -07:00
boot.rb	Adds bootsnap. Faster boot time (#3176)	2017-05-20 19:42:27 +02:00
brakeman.ignore
database.yml	fix unnecessary variable (#3947)	2017-06-25 23:29:22 +02:00
deploy.rb	Update capistrano lock version to 3.8.1 (#3056)	2017-05-14 17:38:29 +02:00
environment.rb
i18n-tasks.yml	Add date to ignore_missing and ignore_unused in config/i18n-tasks.yml (#3572)	2017-06-05 01:02:19 +02:00
navigation.rb	Rename "Credentials" page to "Security" for clarity (#3941)	2017-06-25 22:13:02 +02:00
puma.rb
routes.rb	Merge upstream (#81)	2017-07-15 14:33:15 -07:00
secrets.yml
settings.yml	Merge upstream (#81)	2017-07-15 14:33:15 -07:00
sidekiq.yml	Bind web UI access tokens to sessions (#3940)	2017-06-25 23:51:32 +02:00
webpacker.yml	Fix webpack-dev-server on Windows (#4000)	2017-06-30 13:43:26 +02:00