This repository has been archived on 2023-07-01. You can view files and clone it, but cannot push or open issues or pull requests.

David Yip 16d5217502 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json		2018-04-18 18:48:12 -05:00
..
environments	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-13 16:36:46 -05:00
initializers	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-13 16:36:46 -05:00
locales	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-18 18:48:12 -05:00
webpack	Merge remote-tracking branch 'origin/master' into gs-master	2018-03-27 10:44:12 -05:00
application.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-13 16:36:46 -05:00
boot.rb	Upgrade Rails to version 5.2.0 (#5898)	2018-04-12 14:45:17 +02:00
brakeman.ignore	Save video metadata and improve video OpenGraph tags (#6481)	2018-02-16 07:22:20 +01:00
database.yml	use-DB_NAME-in-development (#5430)	2017-10-17 11:45:37 +02:00
deploy.rb	Upgrade Rails to version 5.2.0 (#5898)	2018-04-12 14:45:17 +02:00
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	2017-09-01 16:20:16 +02:00
i18n-tasks.yml	Merge remote-tracking branch 'origin/master' into gs-master	2018-03-18 20:21:17 -05:00
navigation.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-09 00:17:17 +00:00
puma.rb	Do not set port for puma if it is bound to unix socket (#2289)	2017-04-22 01:22:20 +02:00
routes.rb	Direct messages column (#4514)	2018-04-18 13:09:06 +02:00
secrets.yml	Upgrade to Rails 5.0.0.1	2016-08-17 17:58:00 +02:00
settings.yml	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-02-09 09:25:53 -06:00
sidekiq.yml	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
webpacker.yml	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00