• clone's avatar
    Merge branch '0702-v.2.2.0' into test · ff9f75ec
    clone authored
    # Conflicts:
    #	application/api_broker/service/UploadFileService.php
    #	application/index/controller/Collection.php
    #	application/index/controller/Finance.php
    #	application/index/view/agent/agent.html
    #	application/index/view/collection/getCollection.html
    #	public/app/dist/index.html
    #	public/app/dist/static/css/app.2c71066ef70dbce04427e0ec71aee085.css
    #	public/app/dist/static/css/app.2c71066ef70dbce04427e0ec71aee085.css.map
    #	public/app/dist/static/css/app.65a7482b65465b468cd50d083c6b13f2.css
    #	public/app/dist/static/css/app.cf2603707f2f5640ca6c8f596dac90c4.css
    #	public/app/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
    #	public/app/js/customerinfo_details_new.js
    #	public/resource/js/agent.js
    #	public/resource/js/getCollection.js
    #	public/resource/template/get_collection_template_tpl.html
    ff9f75ec
Name
Last commit
Last update
..
app Loading commit data...
appnew Loading commit data...
resource Loading commit data...
static Loading commit data...
.htaccess Loading commit data...
MP_verify_p9Ei8khm4IKSYIJa.txt Loading commit data...
admin.php Loading commit data...
app.php Loading commit data...
app_broker.php Loading commit data...
broker.php Loading commit data...
chat.php Loading commit data...
favicon.ico Loading commit data...
index.php Loading commit data...
robots.txt Loading commit data...
router.php Loading commit data...
task.php Loading commit data...
xlsx-styles.xlsx Loading commit data...