Merge branch 'master' of http://git.khansia.co.id/Nahrowi/oku-gis
Conflicts: templates/includes/js-m.html
Showing
This diff is collapsed.
static/img/icon-1/bg1.png
0 → 100644
This diff is collapsed.
static/img/icon-1/bg2.svg
0 → 100644
static/img/icon-1/bg3.svg
0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
static/img/icon-1/bg4.svg
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
templates/user/login_.html
0 → 100644
This diff is collapsed.
Please register or sign in to comment