git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge master

Browse Source
This commit is contained in:
Yan
2018-04-05 16:10:59 +06:30
parent 09594f83f2 fe01948dd3
commit 76da718a78
45 changed files with 671 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/secrets.yml
View File

@@ -12,8 +12,13 @@
development:
secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61
<<<<<<< HEAD
sx_provision_url: connect.smartsales.dev/api #connect.smartsales.dev/api #connect.smartsales.asia/api #provision.zsai.ws/api
server_mode: cloud
=======
sx_provision_url: connect.smartsales.asia/api #connect.smartsales.dev/api #connect.smartsales.asia/api #provision.zsai.ws/api
server_mode: application
>>>>>>> fe01948dd322688f7d59acd0d002b569dbbd40e2
cipher_type: AES-256-CBC
sx_key: Wh@t1$C2L