-
xavidp authored
Manually resolved conflicts on * templates/tiki-list_articles.tpl * templates/tiki-view_articles.tpl * templates/edit_file_gallery.tpl
8bbadec5
Manually resolved conflicts on * templates/tiki-list_articles.tpl * templates/tiki-view_articles.tpl * templates/edit_file_gallery.tpl