Browse Source

Merge branch 'master' into dev

windhamdavid 10 years ago
parent
commit
0a9a50cdc3
2 changed files with 2 additions and 2 deletions
  1. 1 1
      app/themes/dw
  2. 1 1
      wp

+ 1 - 1
app/themes/dw

@@ -1 +1 @@
-Subproject commit c74c58810acc1024e5189b8656bc7e2724d508cf
+Subproject commit 3d02eb2ee9a885df3a81bfdbe3953bdc046d044e

+ 1 - 1
wp

@@ -1 +1 @@
-Subproject commit db7b12e25ca02337c43cb22070128099f6525d7f
+Subproject commit 0c7e70604d6048eb58cfdace1a4855721b4deff1