projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c5460e 32549cf)
Merge branch 'nightly' into 'nightly'
authormmn <mmn@hethane.se>
Tue, 5 Jan 2016 23:53:08 +0000 (23:53 +0000)
committermmn <mmn@hethane.se>
Tue, 5 Jan 2016 23:53:08 +0000 (23:53 +0000)
only count post-notices (i.e. don't include activity-notices in statuses_count in the API)

See merge request !73

1  2 
classes/Profile.php patch | diff1 | diff2 | blob | history

diff --cc classes/Profile.php
Simple merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)