diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-02 20:33:58 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-02 20:33:58 -0700 |
| commit | 837b9224cc7cb6c6a38156d4b7ad40e7fd0985b6 (patch) | |
| tree | 150a03edbbf7777ae4c1b3916f851021ac6721a4 | |
| parent | c22da3da1c5d3c5418cb9f142883adb838db9f76 (diff) | |
| parent | 470915a55b9125d4dd361dcba3c5dbe013f3d4e0 (diff) | |
| download | volse-hubzilla-837b9224cc7cb6c6a38156d4b7ad40e7fd0985b6.tar.gz volse-hubzilla-837b9224cc7cb6c6a38156d4b7ad40e7fd0985b6.tar.bz2 volse-hubzilla-837b9224cc7cb6c6a38156d4b7ad40e7fd0985b6.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
doc/credits.bb
mod/thing.php
| -rw-r--r-- | doc/credits.bb | 7 | ||||
| -rw-r--r-- | include/text.php | 4 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/doc/credits.bb b/doc/credits.bb index 5459c7d7a..200f1fc85 100644 --- a/doc/credits.bb +++ b/doc/credits.bb @@ -1,5 +1,9 @@ [b]Credits[/b] +Thanks to all who have helped and contributed to the project and its predecessors over the years. It is possible we missed in your name but this is unintentional. We also thank the community and its members for providing valuable input and without whom this entire effort would be meaningless. + +It is also worth acknowledging the contributions and solutions to problems which arose from discussions amongst members and developers of other somewhat related and competing projects; even if we have had our occasional disagreements. + Mike Macgirvin Fabio Comuni Simon L'nu @@ -62,6 +66,7 @@ tonnerkiller Antoine G Christian Drechsler Ludovic Grossard +RedmatrixCanada Stanislav Lechev [0xAF] aweiher bufalo1973 @@ -73,3 +78,5 @@ mycocham ndurchx pafcu Simó Albert i Beltran +Manuel Reva +Manuel Jiménez Friaza diff --git a/include/text.php b/include/text.php index e4735ac48..4d9670806 100644 --- a/include/text.php +++ b/include/text.php @@ -72,10 +72,6 @@ function notags($string) { // return(str_replace(array("<",">","\xBA","\xBC","\xBE"), array('[',']','','',''), $string)); } -// use this on "body" or "content" input where angle chars shouldn't be removed, -// and allow them to be safely displayed. - - /** * use this on "body" or "content" input where angle chars shouldn't be removed, diff --git a/version.inc b/version.inc index bfff44914..da2499cde 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-09-01.1142 +2015-09-02.1143 |