Christopher Speller bf7ae07117 Merge branch 'release-2.1'

2016-03-14 07:17:31 -04:00

..

react

Merge branch 'release-2.1'

2016-03-14 07:17:31 -04:00

sass-files

Merge branch 'release-2.1'

2016-03-14 07:17:31 -04:00

static

Merge branch 'release-2.1'

2016-03-14 07:17:31 -04:00

web_test.go

Fixing merge

2016-02-01 14:44:17 -08:00

web.go

Convering client to react-router.

2016-03-14 00:38:25 -04:00