Archos/masto-fe-archos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
03cfe366fd0146cb4c3ede4dcdeeb2228a513e7d
masto-fe-archos/app/javascript/styles/mastodon/components.scss
Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/models/user.rb

Resolved by adding :default_language to user settings fields
2018-06-21 20:49:57 +02:00

91 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink