Sabe Jones eed4207c6d Merge branch 'develop' into sabrecat/more-modals ...

Conflicts:
	common/dist/sprites/spritesmith-largeSprites-0.png
	common/locales/en/front.json

2015-11-09 16:24:17 -05:00

..

emoji

Mv images to correct place

2015-02-12 13:44:28 -06:00

logo

Mv images to correct place

2015-02-12 13:44:28 -06:00

project_files

Mv images to correct place

2015-02-12 13:44:28 -06:00

sprites

Merge branch 'develop' into sabrecat/more-modals

2015-11-09 16:24:17 -05:00

bs-docs-masthead-pattern.png

Mv images to correct place

2015-02-12 13:44:28 -06:00

calendar_google.png

Mv images to correct place

2015-02-12 13:44:28 -06:00

calendar_ical.png

Mv images to correct place

2015-02-12 13:44:28 -06:00

screenshot.jpeg

Mv images to correct place

2015-02-12 13:44:28 -06:00