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.

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).		6 years ago
..
_account.html.haml	Enable custom emojis in profiles (notes, field values, display names) (#7374)	6 years ago
_action_log.html.haml	Improve report layout (#7188)	7 years ago
_report.html.haml	Show remote reports in admin UI as coming from domain rather than user (#7347)	6 years ago
_status.html.haml	Get rid of the Content Warning rainbows (#8129)	6 years ago
index.html.haml	Improve report layout (#7188)	7 years ago
show.html.haml	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	6 years ago