luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-19 19:56:56 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/db
History
Thibaut Girka abcba5c198 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- package.json
  Not really a conflict, caused by an additional dependency in glitch-soc.
- yarn.lock
  Not really a conflict, caused by an additional dependency in glitch-soc.
2019-12-07 12:28:59 +01:00
..
migrate Merge branch 'master' into glitch-soc/merge-upstream 2019-12-07 12:28:59 +01:00
post_migrate Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
schema.rb Add bookmarks (#7107) 2019-11-13 23:02:10 +01:00
seeds.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00