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 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb		6 years ago
..
_account.html.haml	Add waiting time to list of pending accounts in admin UI (#10985)	6 years ago
index.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago