aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-11-09 01:03:57 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-11-09 01:03:57 -0800
commit69aeddd185deb28bf0228ca49e101538b966eb81 (patch)
tree6f42c67db1950b76bf81588216d9ecdd68c9b251
parent11c8cabf28a23383979ceb33ec8264ae2b732f3e (diff)
parent99bd69adfe3ad578d6937cfc03e333d4913881c6 (diff)
downloadvolse-hubzilla-69aeddd185deb28bf0228ca49e101538b966eb81.tar.gz
volse-hubzilla-69aeddd185deb28bf0228ca49e101538b966eb81.tar.bz2
volse-hubzilla-69aeddd185deb28bf0228ca49e101538b966eb81.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: README.md version.inc
-rw-r--r--doc/bbcode.html12
-rw-r--r--version.inc3
2 files changed, 8 insertions, 7 deletions
diff --git a/doc/bbcode.html b/doc/bbcode.html
index 4fe47842f..3e9bda1d9 100644
--- a/doc/bbcode.html
+++ b/doc/bbcode.html
@@ -7,11 +7,11 @@
<li>[u]underlined[/u] - <u>underlined</u><br />
<li>[s]strike[/s] - <strike>strike</strike><br />
<li>[color=red]red[/color] - <span style="color: red;">red</span><br />
-<li>[url=https://redmatrix.me]$Projectname[/url] <a href="https://redmatrix.me">$Projectname</a><br />
-<li>[img]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg" alt="Image/photo" /><br />
-<li>[img float=left]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg" style="float:left;" alt="Image/photo" /><br />
+<li>[url=https://zothub.com]$Projectname[/url] <a href="https://zothub.com">$Projectname</a><br />
+<li>[img]https://zothub.com/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://zothub.com/images/default_profile_photos/rainbow_man/48.jpg" alt="Image/photo" /><br />
+<li>[img float=left]https://zothub.com/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://zothub.com/images/default_profile_photos/rainbow_man/48.jpg" style="float:left;" alt="Image/photo" /><br />
<div style="clear:both;"></div>
-<li>[img float=right]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg" style="float:right;" alt="Image/photo" /><br />
+<li>[img float=right]https://zothub.com/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://zothub.com/images/default_profile_photos/rainbow_man/48.jpg" style="float:right;" alt="Image/photo" /><br />
<div style="clear:both;"></div>
<li>[code]code[/code] <code>code</code><br />
<li>[quote]quote[/quote] <blockquote>quote</blockquote><br />
@@ -50,8 +50,8 @@
<p>$Projectname specific codes</p>
<ul class="listbullet" style="list-style-type: circle;">
<li>[&amp;copy;] &copy; This works for many HTML entities</li>
-<li>[zrl]https://redmatrix.me[/zrl] Magic-auth version of [url] tag</li>
-<li>[zmg]https://redmatrix.me/some/photo.jpg[/zmg] Magic-auth version of [img] tag<br /></li>
+<li>[zrl]https://zothub.com[/zrl] Magic-auth version of [url] tag</li>
+<li>[zmg]https://zothub.com/some/photo.jpg[/zmg] Magic-auth version of [img] tag<br /></li>
<li>[observer=1]Text to display if observer is authenticated in the matrix[/observer]</li>
<li>[observer=0]Text to display if observer is <strong>not</strong> authenticated in the matrix[/observer]</li>
diff --git a/version.inc b/version.inc
index 67da5b0b8..11ca984f2 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1,2 @@
-2015-11-08.1210
+2015-11-09.1211
+