Merge branch 'master' into production

This commit is contained in:
Nabin Hait
2012-12-18 13:49:07 +05:30
41 changed files with 519 additions and 489 deletions

View File

@@ -59,7 +59,7 @@
<h4>Icons</h4>
<ul>
<li>The Noun Project</li>
<li>Glyphicons</li>
<li>Font Awesome: http://fortawesome.github.com/Font-Awesome</li>
</ul>
<h4>Web Frameworks</h4>

View File

@@ -1,4 +1,7 @@
erpnext.updates = [
["14th December 2012", [
"Website Module: Major Refactor - removed framework code from website."
]],
["12th December 2012", [
"Attachments: Attachments can be set as URLs or File Uploads. This will help if people want to share documents from Google Docs, Dropbox and other such services (esp for the Product listings on websites).",
"Global Defaults: Session Expiry can now be set in Global Defaults.",