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

Always send content for backwards-compatibility (#7844)

2018-06-18 23:58:13 +02:00

rest

Merge branch 'master' into glitch-soc/merge-upstream

2018-06-21 20:49:57 +02:00

rss

Add RSS feeds for end-users (#7259)

2018-04-25 02:10:02 +02:00

web

Do not encode HTML entities in initial Web Push payload body (#7592)

2018-05-22 18:12:45 +02:00

initial_state_serializer.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-06-15 20:51:39 +02:00

manifest_serializer.rb

implement web share target (#6278)

2018-01-17 17:08:10 +01:00

oembed_serializer.rb

Clean up and improve generated OpenGraph tags (#4901)

2017-09-12 05:39:38 +02:00

webfinger_serializer.rb

Remove rabl dependency (#5894)

2017-12-06 15:04:49 +09:00