Files
Mastodon/config/initializers/cors.rb
David Yip ed490b781f Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	Gemfile.lock
 	config/application.rb
2018-04-13 16:36:46 -05:00

1.1 KiB