David Yip 6cd5b3bbe5 Merge remote-tracking branch 'origin/master' into gs-master		2017-10-16 01:29:02 -05:00
..
activitypub	Use atomUri in Undo activity of Announce (#5376)	2017-10-14 14:42:09 +02:00
rest	Merge upstream 2.0ish #165	2017-10-11 10:43:10 -07:00
web	Fix WebPush (regression from #4524) (#4778)	2017-09-02 16:50:42 +02:00
initial_state_serializer.rb	adding support for audio uploads, transcoded to mp4 videos	2017-10-07 19:54:10 +00:00
manifest_serializer.rb	Make Chrome splash screen same color as web UI's background color (#5169)	2017-10-02 01:23:32 +02:00
oembed_serializer.rb	Clean up and improve generated OpenGraph tags (#4901)	2017-09-12 05:39:38 +02:00