Merge branch 'refs/heads/rails3' into development

Conflicts: README.md
leikind · Aug 27, 2015 · 7131f0e · 7131f0e
2 parents 19b53a3 + 6be6ab3
commit 7131f0e
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/vendor/assets/javascripts/wice_grid_init.js.coffee b/vendor/assets/javascripts/wice_grid_init.js.coffee
@@ -336,3 +336,4 @@ setupExternalSubmitReset =  ->
           false
 
 window['getGridProcessorForElement'] = getGridProcessorForElement
+window['initWiceGrid'] = initWiceGrid