luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-02-12 22:44:28 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/admin/reports
History
David Yip 16d5217502
Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	app/controllers/home_controller.rb
 	app/controllers/stream_entries_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json
2018-04-18 18:48:12 -05:00
..
_account_details.html.haml Feature: add count of account notes to reports (#7130) 2018-04-17 14:58:11 +02:00
_report.html.haml
index.html.haml
show.html.haml Merge remote-tracking branch 'origin/master' into gs-master 2018-04-18 18:48:12 -05:00