]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Wed, 20 Feb 2013 20:57:26 +0000 (21:57 +0100)
committerMichael Vogel <icarus@dabo.de>
Wed, 20 Feb 2013 20:57:26 +0000 (21:57 +0100)
commit0d4d15c73d0bd7f571753d40937ead4c55a797b8
treed35b0b47001f3aa297841a445796673c10a553b7
parentc90272e2ae52ecab496c6aab068a485b8b22e19a
parentc2add79ac0916365efc0ea56fc042382e0e40147
Merge remote-tracking branch 'upstream/master'

Conflicts:
mod/admin.php
boot.php
mod/admin.php
mod/item.php