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

Simple merge
Simple merge