Merge branch 'develop' into refactor-content

This commit is contained in:
Blade Barringer
2015-09-23 07:52:36 -05:00
193 changed files with 4855 additions and 4069 deletions

View File

@@ -11,7 +11,8 @@ let events = {
fall: {start:'2014-09-21',end:'2014-11-01'},
winter2015: {start:'2014-12-21',end:'2015-02-02'},
spring2015: {start:'2015-03-20',end:'2015-05-02'},
summer2015: {start:'2015-06-20',end:'2015-08-02'}
summer2015: {start:'2015-06-20',end:'2015-08-02'},
fall2015: {start:'2015-09-21',end:'2015-11-01'},
}
export default events;