]> git.mxchange.org Git - friendica.git/commit
Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sun, 15 Jul 2012 15:26:00 +0000 (17:26 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 15 Jul 2012 15:26:00 +0000 (17:26 +0200)
commit7aa10d1935e0a61fa9199710ff86431ab24b05e1
treed0391fc52e2493cf67b091e09746753d5832b1d9
parent335c15ede55997989647552c05dd74db3431b499
parent8767eedaac61d8d8d61559799e2c0267c9f5a7ef
Merge remote branch 'upstream/master'
include/items.php
include/text.php