luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-21 12:47:58 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/models/form
History
Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.
2018-12-23 11:28:28 +01:00
..
admin_settings.rb Add admin setting to disable followers count 2018-12-20 14:51:12 +01:00
delete_confirmation.rb
migration.rb Rename ResolveRemoteAccountService to ResolveAccountService (#6327) 2018-01-22 14:25:09 +01:00
status_batch.rb Get rid of all batch order warnings (#8334) 2018-08-21 12:25:50 +02:00
two_factor_confirmation.rb