Ondřej Hruška daad07b1d5 Merge remote-tracking branch 'origin/better-themeing' into merging-upstream		2017-09-28 09:20:59 +02:00
..
environments	Merge tag 'v1.6.0' into sync/upstream	2017-09-10 13:04:27 -05:00
initializers	Merge remote-tracking branch 'origin/better-themeing' into merging-upstream	2017-09-28 09:20:59 +02:00
locales	Merge remote-tracking branch 'origin/better-themeing' into merging-upstream	2017-09-28 09:20:59 +02:00
webpack	Fixed webpack config code	2017-09-25 19:35:54 -07:00
application.rb	Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	2017-09-28 09:12:17 +02:00
boot.rb
brakeman.ignore	Update status embeds (#4742)	2017-08-30 10:23:43 +02:00
database.yml	fix unnecessary variable (#3947)	2017-06-25 23:29:22 +02:00
deploy.rb	Update Capistrano lock version in config/deploy.rb (#4352)	2017-07-25 01:14:01 +02:00
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	2017-09-01 16:20:16 +02:00
i18n-tasks.yml	Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067)	2017-09-25 04:04:04 +02:00
navigation.rb	Admin interface for listing, adding and removing custom emojis (#5002)	2017-09-19 03:52:38 +02:00
puma.rb
routes.rb	Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream	2017-09-28 09:18:35 +02:00
secrets.yml
settings.yml	Better themeing support!!	2017-09-25 19:24:32 -07:00
sidekiq.yml	Randomize sidekiq-scheduler cron schedule (#4980)	2017-09-17 11:58:20 +02:00
webpacker.yml	Upgrade Webpacker to version 3.0.1 (#5122)	2017-09-27 14:41:54 +02:00