about summary refs log tree commit diff
path: root/public/logo-cybre-glitch.gif
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-03-14 17:14:05 +0100
committerThibaut Girka <thib@sitedethib.com>2019-03-14 17:17:20 +0100
commit07eb31eeacc4e0364b839233a41fa65eb3c650ce (patch)
tree843cda5a4d9bc730aba9a13d0634fef5e2212515 /public/logo-cybre-glitch.gif
parentfa75324059c7a146354470691888dc0e1de0342f (diff)
parent874bd3ac0c56e2d2901785e170b27f5cde32b33b (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/admin/settings/edit.html.haml:
  Conflict due to how the theming settings change.
Diffstat (limited to 'public/logo-cybre-glitch.gif')
0 files changed, 0 insertions, 0 deletions