This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it.		2018-12-23 11:28:28 +01:00
..
_action_log.html.haml	…
_status.html.haml	…
index.html.haml	…
show.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-23 11:28:28 +01:00