• Muhamad's avatar
    Merge branch 'tes-baru' of http://git.khansia.co.id/Nahrowi/oku-gis into tes-baru · 9c526a4a
    Muhamad authored
    # Conflicts:
    #	API/__pycache__/views.cpython-37.pyc
    #	API/views.py
    #	Application/__pycache__/views.cpython-37.pyc
    #	Application/views.py
    #	OKU/__pycache__/settings.cpython-37.pyc
    #	myauth/__pycache__/views.cpython-37.pyc
    #	templates/includes/js-o.html
    #	templates/includes/modal.html
    #	templates/includes/navbar.html
    #	templates/includes/plugin.html
    #	templates/layout/layout.html
    #	templates/layout/user_layout.html
    #	templates/maps/e.html
    9c526a4a
layout.html 21.3 KB