mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-22 17:38:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/db
History
Thibaut Girka 291012ec0c Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/accounts_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/statuses_controller.rb

All conflicts caused by the additional `use_pack` used for glitch-soc's theming
system.
2019-03-18 18:03:27 +01:00
..
migrate Merge branch 'master' into glitch-soc/merge-upstream 2019-03-18 18:03:27 +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 2019-03-18 18:03:27 +01:00
seeds.rb Admission-based registrations mode (#10250) 2019-03-14 05:28:30 +01:00