Merge master into bitbucket

This commit is contained in:
Joseph Schorr 2015-04-30 15:52:08 -04:00
commit b96e35b28c
44 changed files with 695 additions and 110 deletions

View file

@ -20,7 +20,7 @@ EXTERNAL_JS = [
EXTERNAL_CSS = [
'netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.css',
'netdna.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css',
'fonts.googleapis.com/css?family=Source+Sans+Pro:400,700',
'fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700',
's3.amazonaws.com/cdn.core-os.net/icons/core-icons.css'
]