]> git.mxchange.org Git - friendica.git/commitdiff
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)
1  2 
include/items.php
mod/admin.php

Simple merge
diff --cc mod/admin.php
Simple merge