diff options
| author | azul <azul@riseup.net> | 2017-03-23 09:03:25 +0000 |
|---|---|---|
| committer | azul <azul@riseup.net> | 2017-03-23 09:03:25 +0000 |
| commit | 96c3123b9a30df3d7750b1f8e4bda2aba3d1fcb7 (patch) | |
| tree | f16e3d9f830cef89d523ef2da66fd27bb2afd426 /app/assets | |
| parent | 3efe125d6e3bd5f4eecd18952376ffc37e09b9c5 (diff) | |
| parent | 1e672227a23afbb9f319a0aefa0b0ca3495fa1c6 (diff) | |
Merge branch 'bugfix/handle-couch-conflicts' into 'master'
bugfix: handle couch 404s
See merge request !26
Diffstat (limited to 'app/assets')
0 files changed, 0 insertions, 0 deletions