You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip 799b205766 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml		7 years ago
..
activitypub	Revert #5772 (#6221)	7 years ago
rest	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
web	Fix WebPush (regression from #4524) (#4778)	7 years ago
initial_state_serializer.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
manifest_serializer.rb	implement web share target (#6278)	7 years ago
oembed_serializer.rb	Clean up and improve generated OpenGraph tags (#4901)	7 years ago
webfinger_serializer.rb	Remove rabl dependency (#5894)	7 years ago