]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Thu, 29 May 2014 21:04:57 +0000 (23:04 +0200)
committerMichael Vogel <icarus@dabo.de>
Thu, 29 May 2014 21:04:57 +0000 (23:04 +0200)
commit13fea42d8cb9c9fb479f5965b842ae5f7cf484f0
treedf4f39e8a849cdfafdbca8a6881863e668ac6f96
parent1fdfd614f011e406f1590ff38f07f2c87c07484d
parentf58104e357fe55bd298773eef23fb9e2ac04abf4
Merge remote-tracking branch 'upstream/master'
include/items.php
mod/admin.php