]> git.mxchange.org Git - friendica.git/commit
Merge develop into 1206-events-template
authorrabuzarus <>
Fri, 17 Jun 2016 12:33:08 +0000 (14:33 +0200)
committerrabuzarus <>
Fri, 17 Jun 2016 12:33:08 +0000 (14:33 +0200)
commit7dc5fc8b9f3d2bb1a9dc8d743ee413778eb59a0e
treea889f39de68f5d6439726d44356e1b5545f878e1
parent4313982e02a04425ec1c14eac52ddfa65cd309d8
parent76abade4d8010bcf751f5eb50d19d457dfa51fe6
Merge develop into 1206-events-template

Conflicts:
view/theme/frio/css/style.css
.gitignore
include/datetime.php
view/theme/frio/css/style.css
view/theme/frio/js/modal.js
view/theme/frio/js/theme.js