luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-04 20:45:13 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/db
History
Thibaut Girka a02244f17c Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/javascript/packs/public.js

Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js
2018-10-09 21:08:26 +02:00
..
migrate Merge branch 'master' into glitch-soc/merge-upstream 2018-10-09 21:08:26 +02:00
post_migrate Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
schema.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-09 21:08:26 +02:00
seeds.rb