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