]> git.mxchange.org Git - friendica.git/commit
Merge remote branch 'upstream/master'
authorMichael <icarus@dabo.de>
Sun, 26 Feb 2012 20:47:47 +0000 (21:47 +0100)
committerMichael <icarus@dabo.de>
Sun, 26 Feb 2012 20:47:47 +0000 (21:47 +0100)
commit437e18d7a7433ea5a9e3388c39ba32c7fe25eb18
tree747449ae089f3dd3f6bb55afdf93fa79081bd564
parentedc44933a4f57c09ee1cfb93615d052a2b125d99
parent2081e6d507d5983f802c1024cf1e38c6d06d6067
Merge remote branch 'upstream/master'
include/delivery.php
include/notifier.php