Merge branch 'master' of http://git.khansia.co.id/Nahrowi/oku-gis
Conflicts: templates/includes/sidebar.html templates/layout/layout.html
Showing
static/js/action.js
0 → 100644
Please register or sign in to comment
Conflicts: templates/includes/sidebar.html templates/layout/layout.html