git.librecmc.org Git - oweals/karmaworld.git/commit

projects / oweals / karmaworld.git / commit

author	Charles Connell <charles@connells.org>
	Sun, 13 Apr 2014 23:17:26 +0000 (19:17 -0400)
committer	Charles Connell <charles@connells.org>
	Sun, 13 Apr 2014 23:17:26 +0000 (19:17 -0400)
commit	f335ab460b0365a9598e8bdc9300d7bedec7a600
tree	b1ed7a5e4ec6ead2d80d8cd89d268803803ab1a8	tree \| snapshot
parent	a5ce9bfce3638c7f1745dbd1230a5bfde0ab7cab	commit \| diff
parent	8a4bf48bc6ff433bb725abca6cbb0b70a9a31434	commit \| diff

Merge branch 'master' into feature_course_add_with_dept

Conflicts:
karmaworld/apps/courses/views.py
karmaworld/assets/css/global.css
karmaworld/assets/js/add-course.js
karmaworld/templates/courses/course_detail.html
karmaworld/templates/courses/course_list.html
karmaworld/templates/courses/course_list_entry.html
karmaworld/templates/partial/add_course.html
karmaworld/templates/user_profile.html

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

karmaworld/apps/courses/admin.py	diff1 \|	diff2 \|	blob \| history
karmaworld/apps/courses/views.py	diff1 \|	diff2 \|	blob \| history
karmaworld/assets/css/global.css	diff1 \|	diff2 \|	blob \| history
karmaworld/assets/css/home.css	diff1 \|	diff2 \|	blob \| history
karmaworld/settings/common.py	diff1 \|	diff2 \|	blob \| history
karmaworld/templates/courses/course_detail.html	diff1 \|	diff2 \|	blob \| history
karmaworld/templates/courses/course_list.html	diff1 \|	diff2 \|	blob \| history
karmaworld/templates/courses/course_list_entry.html	diff1 \|	diff2 \|	blob \| history
karmaworld/templates/partial/add_course.html	diff1 \|	diff2 \|	blob \| history
karmaworld/templates/user_profile.html	diff1 \|	diff2 \|	blob \| history
karmaworld/urls.py	diff1 \|	diff2 \|	blob \| history