Skip to content

S
saturn
Commit e5006e1a authored by 钟尚武's avatar 钟尚武
Browse files
Options

Merge branch 'master' into 'deploy/like-stage' 

fix

See merge request !126
parents 4b762f10 cfd78a2b
Pipeline #4853 passed with stage
    Show whitespace changes
    Inline Side-by-side
    Showing with 0 additions and 4 deletions
    deploy/prod/app_conf.xml
    View file @ e5006e1a
    ......@@ -11,4 +11,3 @@
    <element value="saturn.django_init"/>
    </config>
    </gm_rpcd_config>
    \ No newline at end of file
    ~
    \ No newline at end of file
    deploy/stage/app_conf.xml
    View file @ e5006e1a
    ......@@ -11,4 +11,3 @@
    <element value="saturn.django_init"/>
    </config>
    </gm_rpcd_config>
    \ No newline at end of file
    ~
    \ No newline at end of file
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment