Commit Graph

2 Commits (02b67edfe89efaeddf6a6b3c3044f458695bfbdb)

Author SHA1 Message Date
Quincy Larson cd63977687 Merge branch 'master' into staging
Conflicts:
	seed/challenges/basic-bonfires.json
2015-06-19 17:39:11 -07:00
Berkeley Martinez 272d9b4ad5 Update seed directory to use loopback 2015-06-02 20:32:10 -07:00