Merge branch 'develop'

webnotes · Apr 16, 2014 · a8ee08e · a8ee08e
2 parents 8a5b441 + e7027ed
commit a8ee08e
Show file tree

Hide file tree

Showing 2 changed files with 97 additions and 97 deletions.
diff --git a/config.json b/config.json
@@ -1,6 +1,6 @@
 {
  "base_template": "lib/website/templates/base.html", 
- "framework_version": "3.13.0", 
+ "framework_version": "3.13.1", 
  "modules": {
   "Calendar": {
    "color": "#2980b9",