diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-01 17:08:59 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-01 17:08:59 -0700 |
| commit | 515f3bf111ceeaae5299a62e8508b13f323f7bcf (patch) | |
| tree | 650661a98a230177a307fffcf4c9f2ce9045b6b1 | |
| parent | 3852b5ce7fe83cce93c0826a92c378a589bc8664 (diff) | |
| parent | d753ae4cf1bb0f9c9f4e59ccbaaca6342ef144be (diff) | |
| download | volse-hubzilla-515f3bf111ceeaae5299a62e8508b13f323f7bcf.tar.gz volse-hubzilla-515f3bf111ceeaae5299a62e8508b13f323f7bcf.tar.bz2 volse-hubzilla-515f3bf111ceeaae5299a62e8508b13f323f7bcf.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.php
install/update.php
| -rw-r--r-- | include/identity.php | 1 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/identity.php b/include/identity.php index 8d6a65cad..9ff5af4fe 100644 --- 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) ); diff --git a/version.inc b/version.inc index cafba0e02..bfff44914 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-08-31.1141 +2015-09-01.1142 |