]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master' into develop
authorfabrixxm <fabrix.xm@gmail.com>
Tue, 13 Sep 2016 15:19:57 +0000 (17:19 +0200)
committerfabrixxm <fabrix.xm@gmail.com>
Tue, 13 Sep 2016 15:19:57 +0000 (17:19 +0200)
commit3d6e3cbb78aa7791068ebad173a53c9cf600625a
treefc35d631bca9fd0a8a5b8b14372e90574ed1fd90
parent48c216b0485734da426e275473d3d865e2cfeea1
parent97020817225a8762b699a836da46ba6eed59a162
Merge branch 'master' into develop
view/theme/frio/js/textedit.js
view/theme/frio/templates/event_form.tpl
view/theme/frio/templates/head.tpl