ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
canvas-lms/app
History
Ryan Shaw 77138c4d4a Merge remote-tracking branch 'origin/master' into dev/fft 
Conflicts:
	app/controllers/collections_controller.rb
	app/views/layouts/application.html.erb
	config/build.js
	lib/tasks/parallel_exclude.rb

Change-Id: Ic9664c29d1469c13b514343915c5929dfb15c6ad
 		2012-06-26 10:14:46 -06:00
..
coffeescripts Merge remote-tracking branch 'origin/master' into dev/fft 2012-06-26 10:14:46 -06:00
controllers Merge remote-tracking branch 'origin/master' into dev/fft 2012-06-26 10:14:46 -06:00
helpers Merge remote-tracking branch 'origin/master' into dev/fft 2012-06-26 10:14:46 -06:00
messages fix appointment group signup/cancellation notifications 2012-05-31 13:00:43 -06:00
middleware don't perma-cache special accounts 2012-02-21 10:19:35 -07:00
models Merge remote-tracking branch 'origin/master' into dev/fft 2012-06-26 10:14:46 -06:00
observers fix avatar fallbacks in conversations (and generally), fixes #7539 2012-03-07 11:12:23 -07:00
stylesheets Merge remote-tracking branch 'origin/master' into dev/fft 2012-06-26 10:14:46 -06:00
views Merge remote-tracking branch 'origin/master' into dev/fft 2012-06-26 10:14:46 -06:00