]> git.mxchange.org Git - friendica.git/commit
Merge branch 'develop' into improvement/frio-action-links-to-buttons
authorHypolite Petovan <ben.lort@gmail.com>
Tue, 14 Mar 2017 14:45:17 +0000 (10:45 -0400)
committerHypolite Petovan <ben.lort@gmail.com>
Tue, 14 Mar 2017 14:45:17 +0000 (10:45 -0400)
commit79f14749df35f1063462e1dfef005d2d797f154f
tree1ca0876d832477d1e4de27bf2427e2f354e6abb8
parentcb49bcdb04f819b6a0314941f4762c70b621a997
parent6d087aae23b1d82e1fc65b8916dbebd5e1206c69
Merge branch 'develop' into improvement/frio-action-links-to-buttons

# Conflicts:
# view/theme/frio/templates/search_item.tpl
# view/theme/frio/templates/wall_thread.tpl
view/theme/frio/css/style.css
view/theme/frio/templates/search_item.tpl
view/theme/frio/templates/wall_thread.tpl