]> git.mxchange.org Git - friendica.git/commit
Merge develop into 1006-short-info
authorrabuzarus <trebor@central-unit>
Sat, 11 Jun 2016 08:52:26 +0000 (10:52 +0200)
committerrabuzarus <trebor@central-unit>
Sat, 11 Jun 2016 08:52:26 +0000 (10:52 +0200)
commitd39f679230a55d683da4dcba8ca17f08c6f7f5c0
treebf21010cdbc226358f8f055e18163239d535390c
parent70f97a3536d1b0d1183627d51d097c3dacffe775
parent212fc203d94c97a64ac9b2356977e68863940f2e
Merge develop into 1006-short-info

Conflicts:
view/theme/frio/js/theme.js
.gitignore
view/theme/frio/css/style.css
view/theme/frio/js/theme.js
view/theme/frio/templates/nav.tpl