Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange

# Conflicts: # public/javascripts/wechat/app.js
2016-04-06 15:23:48 +08:00 · 2016-04-06 15:23:48 +08:00 · 42bd2dcfc5
parent 3ee79a6889
commit 42bd2dcfc5
1 changed files with 1 additions and 1 deletions
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@ -1,6 +1,6 @@
 var app = angular.module('wechat', ['ngRoute','ngCookies']);
 var apiUrl = 'http://wechat.trustie.net/api/v1/';
-var debug = true; //调试标志,如果在本地请置为true
+var debug = false; //调试标志,如果在本地请置为true

 if(debug===true){
    apiUrl = 'http://localhost:3000/api/v1/';