• Ozzie Isaacs's avatar
    Merge remote-tracking branch 'cn/fix/bootstrap-table-locale' · fe21d151
    Ozzie Isaacs authored
    # Conflicts:
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt_BR.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh_Hans_CN.min.js
    fe21d151
Name
Last commit
Last update
..
cmaps Loading commit data...
css Loading commit data...
img Loading commit data...
js Loading commit data...
locale Loading commit data...
favicon.ico Loading commit data...
generic_cover.jpg Loading commit data...