https://reisub.nsupdate.info/git / friendica.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91f405b fe0856e)
Merge branch 'develop' of https://github.com/friendica/friendica into develop
authorRalf Thees <ralf@herrthees.de>
Sun, 23 Sep 2018 12:06:17 +0000 (14:06 +0200)
committerRalf Thees <ralf@herrthees.de>
Sun, 23 Sep 2018 12:06:17 +0000 (14:06 +0200)
1  2 
mod/message.php patch | diff1 | diff2 | blob | history
view/theme/frio/js/modal.js patch | diff1 | diff2 | blob | history

diff --cc mod/message.php
Simple merge
diff --cc view/theme/frio/js/modal.js
Simple merge
mirror https://github.com/friendica/friendica.git