David Yip
c816701550
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
.travis.yml
Gemfile.lock
README.md
app/controllers/settings/follower_domains_controller.rb
app/controllers/statuses_controller.rb
app/javascript/mastodon/locales/ja.json
app/lib/feed_manager.rb
app/models/media_attachment.rb
app/models/mute.rb
app/models/status.rb
app/services/mute_service.rb
app/views/home/index.html.haml
app/views/stream_entries/_simple_status.html.haml
config/locales/ca.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
config/locales/nl.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/themes.yml
2018-05-03 17:23:44 -05:00
..
2018-05-02 15:44:22 +02:00
2018-01-22 14:25:09 +01:00
2018-04-23 21:27:18 +02:00
2017-12-06 11:41:57 +01:00
2018-03-17 17:39:28 +01:00
2018-04-18 13:09:06 +02:00
2018-03-08 06:59:42 +01:00
2018-05-02 18:58:48 +02:00
2018-05-02 15:50:20 +02:00
2018-05-02 12:40:24 +02:00
2018-05-02 18:58:48 +02:00
2018-05-02 18:58:48 +02:00
2017-10-04 01:13:48 +02:00
2017-12-12 15:11:13 +01:00
2018-01-22 14:25:09 +01:00
2018-05-02 16:14:51 +02:00
2018-01-18 16:12:10 +01:00
2018-04-11 00:50:09 +00:00
2018-01-17 23:56:03 +01:00
2017-12-06 11:41:57 +01:00
2018-04-22 22:09:03 +02:00
2018-05-02 22:10:57 +02:00
2017-12-11 17:39:11 -06:00
2018-04-18 13:09:06 +02:00
2018-02-28 06:54:55 +01:00
2018-05-02 12:40:24 +02:00
2018-05-02 12:40:24 +02:00
2018-04-16 17:19:04 +02:00
2018-03-24 12:49:54 +01:00
2018-03-24 12:49:54 +01:00
2018-01-04 14:40:49 +01:00
2018-03-24 12:49:54 +01:00
2018-04-01 23:55:42 +02:00