Skip to content
GitLab
Explore
Sign in
Register
This is an archived project. Repository and other project resources are read-only.
Pleroma
mastofe
Repository
mastofe
config
navigation.rb
Find file
Blame
History
Permalink
Merge branch 'master' into glitch-soc/merge-upstream
· 9adeaf2b
Thibaut Girka
authored
Jan 24, 2020
Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system
9adeaf2b