]> git.mxchange.org Git - friendica.git/commit
Merge develop into manage
authorrabuzarus <trebor@central-unit>
Sun, 25 Oct 2015 15:57:04 +0000 (16:57 +0100)
committerrabuzarus <trebor@central-unit>
Sun, 25 Oct 2015 15:57:04 +0000 (16:57 +0100)
commit4c263aa4ac89aa935d7305856c8a919c7fefcf71
treee02d42452e2b3e3c8342bf88359b49e1af697fa6
parentbac61cf596c143a15a430b5ba15d9f3a8dfe21e5
parent03ff349a942c803887b9f8a8c56c1ae8d9160cb6
Merge develop into manage

Conflicts:
view/global.css
view/global.css
view/theme/frost-mobile/style.css
view/theme/frost/style.css