Permalink
Browse files

Merge remote-tracking branch 'origin/master'

Conflicts:
	test_grappelli/static/jquery.js
  • Loading branch information...
2 parents ac559f5 + e914e7e commit 3590752adfcda3c19b57c2f2bb7f0ace0c4eba21 @mpasternak mpasternak committed Aug 25, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 test_grappelli/static/jquery.js
@@ -0,0 +1 @@
+../../test_project/static/jquery.js

0 comments on commit 3590752

Please sign in to comment.