Ondřej Hruška 9330ea1f4d Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream		2017-09-28 09:12:17 +02:00
..
environments	Merge tag 'v1.6.0' into sync/upstream	2017-09-10 13:04:27 -05:00
initializers	Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	2017-09-28 09:12:17 +02:00
locales	Admin interface for listing, adding and removing custom emojis (#5002)	2017-09-19 03:52:38 +02:00
webpack	Merge branch 'origin/master' into sync/upstream	2017-09-09 14:27:47 -05: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	…
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	Shorten display of large numbers on public profiles (#4711)	2017-08-27 17:04:45 +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 '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	2017-09-28 09:12:17 +02:00
secrets.yml	…
settings.yml	Merge tag 'v1.6.0' into sync/upstream	2017-09-10 13:04:27 -05:00
sidekiq.yml	Randomize sidekiq-scheduler cron schedule (#4980)	2017-09-17 11:58:20 +02:00
webpacker.yml	…