Commit graph

3 commits

Author SHA1 Message Date
Roland Häder 7a9456d5ac
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>
2017-05-11 14:54:26 +02:00
fabrixxm 588f87bf79 Standards 2017-05-01 18:25:56 +02:00
fabrixxm 57366e391f frio: admin aside template 2017-04-27 21:25:53 +02:00