]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - plugins/DiskCache/locale/hy_AM/LC_MESSAGES/DiskCache.po
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1b81131 96e0867)
Merge branch 'master' into nightly
authorMikael Nordfeldth <mmn@hethane.se>
Thu, 5 Nov 2015 15:07:05 +0000 (16:07 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Thu, 5 Nov 2015 15:07:05 +0000 (16:07 +0100)
commitc950f1854623f0df2a50c193f624f0a0bf1fcbb3
tree4f01c90a8ec579a9c4e67bbf3f6bb4290be8aa2atree | snapshot
parent1b81131c51ccb99c04342654c23877126f9db2cfcommit | diff
parent96e0867d4c52647af4455117f27e20a23aac3ec9commit | diff
Merge branch 'master' into nightly

Some merge requests that were aimed at master
lib/noticelistitem.php diff1 | diff2 | blob | history
plugins/OStatus/classes/Ostatus_profile.php diff1 | diff2 | blob | history
plugins/Share/SharePlugin.php diff1 | diff2 | blob | history
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)