]> git.mxchange.org Git - friendica.git/commit
Merge branch 'develop' into improvement/frio-action-links-to-buttons
authorHypolite Petovan <mrpetovan@gmail.com>
Sun, 26 Mar 2017 00:27:26 +0000 (20:27 -0400)
committerHypolite Petovan <mrpetovan@gmail.com>
Sun, 26 Mar 2017 00:27:26 +0000 (20:27 -0400)
commitd7f80bf7e7f90485f6713ae6968311c9748bbb95
treeed6f1c314c02574850ae74a629066f178bed8199
parentd78acd54088784c2b9823c7a37f279c992287b35
parent7850abcee350fb3e6d1f34d8abd6381d822a58b0
Merge branch 'develop' into improvement/frio-action-links-to-buttons

# Conflicts:
# view/theme/frio/js/filebrowser.js
# view/theme/frio/templates/filebrowser.tpl
view/theme/frio/css/style.css
view/theme/frio/js/filebrowser.js
view/theme/frio/templates/filebrowser.tpl