fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-16 23:22:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/config/environments
History
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
..
development.rb Upgrade Rails to version 5.2.0 (#5898) 2018-04-12 14:45:17 +02:00
production.rb Merge remote-tracking branch 'origin/master' into gs-master 2018-04-13 16:36:46 -05:00
test.rb Upgrade Rails to version 5.2.0 (#5898) 2018-04-12 14:45:17 +02:00