]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1dc4b60 bc724f2)
Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convent...
authorRoland Häder <roland@mxchange.org>
Thu, 11 May 2017 12:54:26 +0000 (14:54 +0200)
committerRoland Häder <roland@mxchange.org>
Thu, 11 May 2017 12:54:26 +0000 (14:54 +0200)
commit7a9456d5ac2e73229b2237074c700731c63661a6
tree3eb46d48686c49e6f85cb551626d3287276a07d8tree | snapshot
parent1dc4b60a5ac4a12288627bc65cda941164c12059commit | diff
parentbc724f2b68004fc90729adba150360ab7456747dcommit | diff
Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2

Fixed some stuff:
- converted some files from DOS to Uni* (CRLF -> LF)
- removed trailing white-spaces

Signed-off-by: Roland Häder <roland@mxchange.org>
25 files changed:
doc/api.md diff1 | diff2 | blob | history
doc/autoloader.md diff1 | diff2 | blob | history
include/identity.php diff1 | diff2 | blob | history
include/message.php diff1 | diff2 | blob | history
include/msgclean.php diff1 | diff2 | blob | history
include/nav.php diff1 | diff2 | blob | history
include/network.php diff1 | diff2 | blob | history
include/oauth.php diff1 | diff2 | blob | history
include/oembed.php diff1 | diff2 | blob | history
include/onepoll.php diff1 | diff2 | blob | history
include/ostatus.php diff1 | diff2 | blob | history
include/uimport.php diff1 | diff2 | blob | history
mod/login.php diff1 | diff2 | blob | history
mod/pretheme.php diff1 | diff2 | blob | history
mod/uimport.php diff1 | diff2 | blob | history
view/php/default.php diff1 | diff2 | blob | history
view/php/minimal.php diff1 | diff2 | blob | history
view/templates/group_drop.tpl diff1 | diff2 | blob | history
view/templates/groupeditor.tpl diff1 | diff2 | blob | history
view/theme/frio/js/mod_group.js | diff2 | blob | history
view/theme/frio/templates/admin_aside.tpl | diff2 | blob | history
view/theme/frio/templates/group_edit.tpl | diff2 | blob | history
view/theme/frio/templates/groupeditor.tpl | diff2 | blob | history
view/theme/frost-mobile/php/default.php diff1 | diff2 | blob | history
view/theme/frost/php/default.php diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.