Archos/masto-fe-archos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
df42de68e587ba3e86f3d2536c41463fa0f97b1e
masto-fe-archos/app/models/form/admin_settings.rb
T
Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
2019-04-01 21:28:31 +02:00

2.6 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink