djsundog
/
tootlab-mastodon
mirror of https://github.com/glitch-soc/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/db
History
Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.
 		2018-12-23 11:28:28 +01:00
..
migrate Merge branch 'master' into glitch-soc/merge-upstream 2018-12-23 11:28:28 +01:00
post_migrate Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
schema.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-23 11:28:28 +01:00
seeds.rb Fix db:seed - only run some validations when the field was changed (#3592) 2017-06-08 09:22:01 -04:00