luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-23 05:37:47 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/config
History
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
deploy.rb Upgrade Rails to version 5.2.0 (#5898) 2018-04-12 14:45:17 +02:00
environment.rb
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
routes.rb Direct messages column (#4514) 2018-04-18 13:09:06 +02:00
secrets.yml
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