Merge branch 'master' into develop

DANG
2 parents cfbd788dda a090601994
Showing 1 changed file Side-by-side Diff
app/index.html
@@ -47,7 +47,7 @@
     <script src="bower_components/json3/lib/json3.min.js"></script>
     <![endif]-->
     <script type="text/javascript">
-        var VERSION = '29-11_01';
+        var VERSION = '29-11_02';
         var require = {
           urlArgs: "ver="+VERSION,
         };
...	...	@@ -47,7 +47,7 @@
47	47	<script src="bower_components/json3/lib/json3.min.js"></script>
48	48	<![endif]-->
49	49	<script type="text/javascript">
50		- var VERSION = '29-11_01';
	50	+ var VERSION = '29-11_02';
51	51	var require = {
52	52	urlArgs: "ver="+VERSION,
53	53	};