Scott Erickson 05bd12e8cc Merge branch 'email-validation' of https://github.com/JordanLittell/codecombat into JordanLittell-email-validation ... # Conflicts: # app/views/account/SubscriptionView.coffee		2015-11-04 10:47:39 -08:00
..
assets	Use an newer, official build of ace instead of just copying the files into our source tree.	2015-11-03 17:33:35 -08:00
collections	added achievement editor for #2304	2015-02-16 17:12:05 -05:00
core	Merge pull request #3118 from codecombat/soffes/ipad	2015-10-29 16:24:39 -07:00
lib	Merge pull request #3129 from Driphter/master	2015-10-28 06:38:07 -07:00
locale	Merge pull request #3155 from mads232/patch-2	2015-11-04 18:04:24 +00:00
models	Fix sortThangComponents corner case in course levels with Plans attaching twice	2015-11-02 12:35:28 -08:00
schemas	Add programming language to options in course instances	2015-10-30 15:56:43 -07:00
styles	Merge branch 'email-validation' of https://github.com/JordanLittell/codecombat into JordanLittell-email-validation	2015-11-04 10:47:39 -08:00
templates	Merge branch 'email-validation' of https://github.com/JordanLittell/codecombat into JordanLittell-email-validation	2015-11-04 10:47:39 -08:00
views	Merge branch 'email-validation' of https://github.com/JordanLittell/codecombat into JordanLittell-email-validation	2015-11-04 10:47:39 -08:00