luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-10 00:46:12 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/db
History
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master 
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
2018-05-10 00:03:28 +02:00
..
migrate Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
schema.rb Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
seeds.rb