]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d0bf3c0 17e8c29)
Merge pull request #1683 from fabrixxm/issue-1655
authorMichael Vogel <icarus@dabo.de>
Sat, 27 Jun 2015 15:39:00 +0000 (17:39 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 27 Jun 2015 15:39:00 +0000 (17:39 +0200)
Deprecate RINO1 function, implements RINO2, remove unused crypro functions

1  2 
include/items.php patch | diff1 | diff2 | blob | history
mod/admin.php patch | diff1 | diff2 | blob | history

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