summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2017-03-23 09:03:25 +0000
committerazul <azul@riseup.net>2017-03-23 09:03:25 +0000
commit96c3123b9a30df3d7750b1f8e4bda2aba3d1fcb7 (patch)
treef16e3d9f830cef89d523ef2da66fd27bb2afd426 /app/views
parent3efe125d6e3bd5f4eecd18952376ffc37e09b9c5 (diff)
parent1e672227a23afbb9f319a0aefa0b0ca3495fa1c6 (diff)
Merge branch 'bugfix/handle-couch-conflicts' into 'master'
bugfix: handle couch 404s See merge request !26
Diffstat (limited to 'app/views')
-rw-r--r--app/views/errors/server_error.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/errors/server_error.json b/app/views/errors/server_error.json
index d9a1a86..a2763f6 100644
--- a/app/views/errors/server_error.json
+++ b/app/views/errors/server_error.json
@@ -1,4 +1,4 @@
{
- "error": "server_error",
+ "error": "server failed",
"message": "Server Error"
-} \ No newline at end of file
+}