From 42bd2dcfc5f1c0aaa2a4d75cb82dc3dc7f91e71a Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 6 Apr 2016 15:23:48 +0800
Subject: [PATCH] Merge branch 'weixin_guange' of
 https://git.trustie.net/jacknudt/trustieforge into weixin_guange

# Conflicts:
#	public/javascripts/wechat/app.js
---
 public/javascripts/wechat/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index f3c86e966..c0104b358 100644
--- 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/';