]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7001a23 b202e02)
Merge pull request #2326 from fabrixxm/revert_db949bb8
authorMichael Vogel <icarus@dabo.de>
Tue, 9 Feb 2016 05:55:49 +0000 (06:55 +0100)
committerMichael Vogel <icarus@dabo.de>
Tue, 9 Feb 2016 05:55:49 +0000 (06:55 +0100)
Revert "Updated modules to allow for partial overrides without errors"

1  2 
mod/dfrn_notify.php patch | diff1 | diff2 | blob | history
mod/ping.php patch | diff1 | diff2 | blob | history

diff --cc mod/dfrn_notify.php
Simple merge
diff --cc mod/ping.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.