Merge https://github.com/redmatrix/redmatrix into pending_merge

Conflicts: include/identity.php install/update.php
2015-09-01 17:08:59 -07:00 · 2015-09-01 17:08:59 -07:00 · 515f3bf111
commit 515f3bf111
parent 3852b5ce7f d753ae4cf1
2 changed files with 1 additions and 2 deletions
--- a/include/identity.php
+++ b/include/identity.php
@ -565,7 +565,6 @@ function identity_basic_export($channel_id, $items = false) {
 	if(! $items)
 		return $ret;

-
 	$r = q("select * from likes where channel_id = %d",
 		intval($channel_id)
 	);
--- a/version.inc
+++ b/version.inc
@ -1 +1 @@
-2015-08-31.1141
+2015-09-01.1142