Merge remote-tracking branch 'origin/master'

Conflicts: test_grappelli/static/jquery.js
yourlabs · Aug 25, 2012 · 3590752 · 3590752
2 parents ac559f5 + e914e7e
commit 3590752
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/test_grappelli/static/jquery.js b/test_grappelli/static/jquery.js
@@ -0,0 +1 @@
+../../test_project/static/jquery.js