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
..
activitypub
rest	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
rss
web
initial_state_serializer.rb
manifest_serializer.rb
oembed_serializer.rb
webfinger_serializer.rb