diff options
author | ThibG <thib@sitedethib.com> | 2019-03-08 01:47:36 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-08 01:47:36 +0100 |
commit | 29a09858f6700c0a6eb17797836589ed0839dec9 (patch) | |
tree | 96ac7fbac23d6ca32704c143342b5606523c8cab /app/views/layouts/mailer.html.haml | |
parent | 38e9c66f34d7054357a3de63834f182734d43d75 (diff) | |
parent | ca45198ccbbdde88731f074fcab2b5c9310775c2 (diff) |
Merge pull request #945 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/layouts/mailer.html.haml')
0 files changed, 0 insertions, 0 deletions