Merge develop into 1404_reworked_autocomplete
authorrabuzarus <>
Thu, 14 Apr 2016 14:23:51 +0000 (16:23 +0200)
committerrabuzarus <>
Thu, 14 Apr 2016 14:23:51 +0000 (16:23 +0200)
commit01b02dbcaa8532f965389375e961d9c47d74eeec
tree8d9bd0db241d4cf71faa9e12ab55cc9fe523fc91
parent30c375d238af79795937b8df046abe9f0ee63db9
parenta7d6fa1bc9f0e8f350fd09b65b42008b6f97372d
Merge develop into 1404_reworked_autocomplete

Conflicts:
include/text.php
view/templates/head.tpl
view/theme/duepuntozero/style.css
view/theme/vier/style.css
19 files changed:
.gitignore
include/Smilies.php
include/nav.php
include/network.php
include/text.php
js/main.js
view/global.css
view/templates/head.tpl
view/templates/jot-header.tpl
view/theme/duepuntozero/style.css
view/theme/frost-mobile/js/main.js
view/theme/frost-mobile/style.css
view/theme/frost/style.css
view/theme/quattro/dark/style.css
view/theme/quattro/green/style.css
view/theme/quattro/lilac/style.css
view/theme/quattro/quattro.less
view/theme/smoothly/style.css
view/theme/vier/style.css