tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
b9aa57d5bfd53eb73ff4bb5e1beb91ee181345eb
Mastodon/app/controllers/auth/registrations_controller.rb
Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system
2020-01-24 14:37:06 +01:00

3.2 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink