Mike Barnes 69d0b8ff68 Merge upstream 'v2.4.3'		2018-08-07 11:18:35 +10:00
..
environments
initializers	Add more granular OAuth scopes (#7929)	2018-07-05 18:31:35 +02:00
locales	Merge upstream 'v2.4.3'	2018-08-07 11:18:35 +10:00
webpack	Rename emoji sheet to avoid caching issue (#7777)	2018-06-10 16:12:47 +02:00
application.rb	Weblate translations (2018-07-05) (#7950)	2018-07-05 21:50:16 +09:00
boot.rb
brakeman.ignore
database.yml
deploy.rb
environment.rb
i18n-tasks.yml
navigation.rb	Keyword/phrase filtering (#7905)	2018-06-29 15:34:36 +02:00
puma.rb
routes.rb	Add API method to remove a suggestion (#7978)	2018-07-07 21:09:54 +02:00
secrets.yml
settings.yml	Add admin setting to enable OG previews for sensitive media (#7962)	2018-07-06 02:15:56 +02:00
sidekiq.yml
themes.yml	Sync to 2.4.1	2018-06-11 15:23:25 +10:00
webpacker.yml