vedatakd c21a370d37 Merge branch 'master' of https://github.com/openclassify/openclassify into basetheme ... # Conflicts: # addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/author-button.twig # addons/default/visiosoft/advs-module/resources/views/list/list.twig # addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig # addons/default/visiosoft/base-theme/resources/config/settings.php # addons/default/visiosoft/base-theme/resources/js/filterLocation.js # addons/default/visiosoft/base-theme/resources/views/indexes/index.twig		2019-12-03 19:35:30 +03:00
..
default	Merge branch 'master' of https://github.com/openclassify/openclassify into basetheme	2019-12-03 19:35:30 +03:00
.gitkeep	move from Gitlab without history - v 0.9	2019-06-22 13:59:18 +03:00