Thibaut Girka 9044a2b051 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/directories/index.html.haml
  Upstream has redesigned the profile directory, and we
  had a glitch-soc-specific change to hide follower counts.
  Ported that change to the new design.
2019-08-30 13:38:41 +02:00
..
2019-06-20 02:52:34 +02:00
2017-11-24 02:05:53 +01:00
2019-08-17 22:04:15 +02:00
2019-07-30 11:10:46 +02:00
2019-07-30 11:10:46 +02:00
2017-12-01 16:40:02 +01:00
2019-08-19 11:40:42 +02:00
2017-11-18 00:16:48 +01:00
2019-08-17 22:04:15 +02:00
2019-06-20 02:52:34 +02:00
2017-01-13 03:24:41 +01:00