tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
45fce0e496
mastodon/db
History
Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge 
Conflicts:
	app/controllers/invites_controller.rb
	app/serializers/initial_state_serializer.rb
	config/locales/ko.yml
2018-05-11 18:12:42 +02:00
..
migrate Merge branch 'master' into glitch-soc/merge 2018-05-11 18:12:42 +02:00
schema.rb Merge branch 'master' into glitch-soc/merge 2018-05-11 18:12:42 +02:00
seeds.rb Fix db:seed - only run some validations when the field was changed (#3592) 2017-06-08 09:22:01 -04:00