Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ...

Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml

2018-05-10 00:03:28 +02:00

..

activitypub

Bot nameplates (#7391)

2018-05-07 09:31:07 +02:00

rest

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +02:00

rss

Add RSS feeds for end-users (#7259)

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

web

Fix WebPush (regression from #4524) (#4778)

2017-09-02 16:50:42 +02:00

initial_state_serializer.rb

retrieve custom emoji list via API instead of before page load (#7047)

2018-04-04 22:25:34 +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