Merge branch 'stable'
This commit is contained in:
commit
9b687da2a0
@ -3,7 +3,7 @@
|
||||
<meta charset="utf-8">
|
||||
<title>ERPNext</title>
|
||||
<meta name="author" content="">
|
||||
<script type="text/javascript">window._version_number="30"
|
||||
<script type="text/javascript">window._version_number="31"
|
||||
|
||||
wn={}
|
||||
wn.provide=function(namespace){var nsl=namespace.split('.');var l=nsl.length;var parent=window;for(var i=0;i<l;i++){var n=nsl[i];if(!parent[n]){parent[n]={}}
|
||||
@ -70,10 +70,10 @@ throw new SyntaxError('JSON.parse');};}}());wn.versions.check();wn.require("lib/
|
||||
<div id="body_div">
|
||||
|
||||
<!--static (no script) content-->
|
||||
<div class="no_script">
|
||||
No content
|
||||
<div class="no_script" style='font-family: verdana, sans'>
|
||||
Loading...
|
||||
</div>
|
||||
</div>
|
||||
<script>wn.require('js/app.js');</script>
|
||||
<div id="dialog_back"></div>
|
||||
</body>
|
||||
</body>
|
||||
|
@ -12,10 +12,10 @@
|
||||
<div id="body_div">
|
||||
|
||||
<!--static (no script) content-->
|
||||
<div class="no_script">
|
||||
No content
|
||||
<div class="no_script" style='font-family: verdana, sans'>
|
||||
Loading...
|
||||
</div>
|
||||
</div>
|
||||
<script>wn.require('js/app.js');</script>
|
||||
<div id="dialog_back"></div>
|
||||
</body>
|
||||
</body>
|
||||
|
@ -1 +1 @@
|
||||
30
|
||||
31
|
Loading…
Reference in New Issue
Block a user