Merge branch 'staging' into jquery

Browse Source

Conflicts:
	seed/challenges/bootstrap.json

...

This commit is contained in:

Quincy Larson

2015-08-10 22:03:51 -07:00

parent d838036ed2 5ad9cf8fab

commit f2356c6767

25 changed files with 1563 additions and 2148 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

287

challenges/html5-and-css.json

File diff suppressed because it is too large Load Diff