| commit | f8b01097acc3bb7cb0854aee84d6112e3491b612 | [log] [tgz] |
|---|---|---|
| author | Anand Doshi <anand@iwebnotes.com> | Tue Nov 15 15:24:11 2011 +0530 |
| committer | Anand Doshi <anand@iwebnotes.com> | Tue Nov 15 15:24:11 2011 +0530 |
| tree | 512c3cce2e8d213cf2edc09d16941c68f23c96b5 | |
| parent | 3cb68e17b911b2945f7bb04906031075f39b6a09 [diff] [blame] | |
| parent | 5b7badaf207d79a5f3778ebee4135253836cdef8 [diff] [blame] |
Merge branch 'master' of github.com:webnotes/erpnext Conflicts: index.html
diff --git a/index.html b/index.html index 4ab0b9b..c28b0aa 100644 --- a/index.html +++ b/index.html
@@ -79,4 +79,4 @@ </div> <script>wn.require('js/app.js');</script> <div id="dialog_back"></div> -</body> \ No newline at end of file +</body>