diff options
| author | elijah <elijah@riseup.net> | 2017-08-15 11:32:21 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2017-08-15 11:32:21 -0700 |
| commit | 8b0974e22f4b48ddb4d1fded9c4f65d4b6a88180 (patch) | |
| tree | dbc872dd00e54ea0a969cf63aa83a942e31992e7 /app/assets | |
| parent | bc9dc8e62a01b9f961026e7d33be4d9f92763920 (diff) | |
remove merge cruft
Diffstat (limited to 'app/assets')
0 files changed, 0 insertions, 0 deletions