Jay Zoldak ed5ad46192 Revert "Revert "fix merge conflict"" ...

This reverts commit 2df3fe9344.

Conflicts:
	common/static/coffee/src/discussion/utils.coffee

2013-05-16 10:29:33 -04:00

..

spec

Add leanModal vendor src to files.json for cms jasmine tests. Also .gitignore compiled js from coffee specs

2013-04-30 15:22:08 -04:00

src

Revert "Revert "fix merge conflict""

2013-05-16 10:29:33 -04:00