You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Ondřej Hruška 914c0465b1 Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream		7 years ago
..
environments	Merge tag 'v1.6.0' into sync/upstream	7 years ago
initializers	Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream	7 years ago
locales	Admin interface for listing, adding and removing custom emojis (#5002)	7 years ago
webpack	Merge branch 'origin/master' into sync/upstream	7 years ago
application.rb	Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream	7 years ago
boot.rb	Adds bootsnap. Faster boot time (#3176)	8 years ago
brakeman.ignore	Update status embeds (#4742)	7 years ago
database.yml	fix unnecessary variable (#3947)	7 years ago
deploy.rb	Update Capistrano lock version in config/deploy.rb (#4352)	7 years ago
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	7 years ago
i18n-tasks.yml	Shorten display of large numbers on public profiles (#4711)	7 years ago
navigation.rb	Admin interface for listing, adding and removing custom emojis (#5002)	7 years ago
puma.rb	Do not set port for puma if it is bound to unix socket (#2289)	8 years ago
routes.rb	Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream	7 years ago
secrets.yml	Upgrade to Rails 5.0.0.1	8 years ago
settings.yml	Merge tag 'v1.6.0' into sync/upstream	7 years ago
sidekiq.yml	Randomize sidekiq-scheduler cron schedule (#4980)	7 years ago
webpacker.yml	Fix webpack-dev-server on Windows (#4000)	7 years ago