]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Tue, 12 Aug 2014 22:18:05 +0000 (00:18 +0200)
committerMichael Vogel <icarus@dabo.de>
Tue, 12 Aug 2014 22:18:05 +0000 (00:18 +0200)
commitde75d8ca7f3179fabcec1c954b92bce10080bfba
tree58109b9cdd29811a4bdf55eabb773154127befee
parentd4b2d3bf8a64e1fef8dbd88dbd625acbdef4a0df
parentd28c1febc78ffc4b3d3758b4cf413f90e9a58cae
Merge remote-tracking branch 'upstream/master'

Conflicts:
mod/admin.php
include/api.php
include/text.php
mod/admin.php
view/templates/admin_site.tpl