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 020b40efdb 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
..
show.html.haml	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago