about summary refs log tree commit diff
path: root/app/views/shares
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-08-30 13:38:41 +0200
committerThibaut Girka <thib@sitedethib.com>2019-08-30 13:38:41 +0200
commit9044a2b051da18e9f70fd4fae55c2bd232891d1f (patch)
tree0bf32b0fa0e854f75e50c1dee05ec41f6b301bf4 /app/views/shares
parent2848c08953a8555e06791170dbf1090575e05d8a (diff)
parent49f57b55346f8e62d21a3c8bc63301038ecb796f (diff)
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.
Diffstat (limited to 'app/views/shares')
0 files changed, 0 insertions, 0 deletions