catstodon/app/views/admin/reports
Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/models/status.rb
	db/migrate/20180528141303_fix_accounts_unique_index.rb
	db/schema.rb

Resolved by taking upstream changes (no real conflicts, just glitch-soc
specific code too close to actual changes).
2018-08-17 17:43:54 +02:00
..
_account.html.haml Enable custom emojis in profiles (notes, field values, display names) (#7374) 2018-05-06 11:48:51 +02:00
_action_log.html.haml Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
_report.html.haml Show remote reports in admin UI as coming from domain rather than user (#7347) 2018-05-04 13:26:25 +02:00
_status.html.haml Get rid of the Content Warning rainbows (#8129) 2018-08-15 19:38:56 +02:00
index.html.haml Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
show.html.haml Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-05-21 18:17:23 +00:00