aboutsummaryrefslogtreecommitdiffstats
path: root/view/cs/update_fail_eml.tpl
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-05-14 18:02:29 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-05-14 18:02:29 -0700
commita6cb90c81c29663e96d4fd96acd43fde1c28ac15 (patch)
tree24d116fb5fe6b1e2687f833cee9685d6480a95eb /view/cs/update_fail_eml.tpl
parentb467dc4f0055452b65fac842d1294ec9cc978445 (diff)
parent51b89f0ed8833004cf695de90791d8d0eec550b5 (diff)
downloadvolse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.tar.gz
volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.tar.bz2
volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.zip
Merge branch 'master' into tres
Conflicts: include/Import/refimport.php include/activities.php include/attach.php include/event.php include/externals.php include/identity.php include/items.php include/notifier.php include/photos.php include/taxonomy.php include/zot.php mod/channel.php mod/connedit.php mod/events.php mod/item.php mod/like.php mod/manage.php mod/mood.php mod/ping.php mod/poke.php mod/subthread.php mod/tagger.php mod/thing.php
Diffstat (limited to 'view/cs/update_fail_eml.tpl')
-rw-r--r--view/cs/update_fail_eml.tpl2
1 files changed, 1 insertions, 1 deletions
diff --git a/view/cs/update_fail_eml.tpl b/view/cs/update_fail_eml.tpl
index a7df8fc2f..61f44b1e6 100644
--- a/view/cs/update_fail_eml.tpl
+++ b/view/cs/update_fail_eml.tpl
@@ -1,7 +1,7 @@
Hey,
I'm the web server at {{$sitename}};
-The Red Matrix developers released update {{$update}} recently,
+The Hubzilla developers released update {{$update}} recently,
but when I tried to install it, something went terribly wrong.
This needs to be fixed soon and it requires human intervention.
Please contact a Red developer if you can not figure out how to