lms/static/sass · ed5ad46192c62761762e35a608ab79c6923a6851 · edx / edx-platform · GitLab

History Find file

Revert "Revert "fix merge conflict"" · ed5ad461

This reverts commit 2df3fe93.

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

committed May 16, 2013

Name	Last commit	Last update
..
base		Loading commit data...
course		Loading commit data...
multicourse		Loading commit data...
shared		Loading commit data...
.gitignore		Loading commit data...
README.txt		Loading commit data...
_discussion-old.scss		Loading commit data...
_discussion.scss		Loading commit data...
_news.scss		Loading commit data...
application.scss		Loading commit data...
course.scss		Loading commit data...
ie.scss		Loading commit data...