David Yip 813da6788e

Merge remote-tracking branch 'origin/master' into gs-master ...

Conflicts:
 	db/schema.rb

2018-04-14 09:12:50 -05:00

..

activitypub

Add bio fields (#6645)

2018-04-14 12:41:08 +02:00

rest

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-14 09:12:50 -05: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