kumavis 57aca116ed Merge branch 'master' into FixSomeFormatting ... # Conflicts: # CHANGELOG.md # app/scripts/lib/notifications.js		2016-06-28 13:11:50 -07:00
..
_locales/en
fonts/Montserrat	Swap out Transat font for Montserrat	2016-06-22 15:35:52 -07:00
images
scripts	Merge branch 'master' into FixSomeFormatting	2016-06-28 13:11:50 -07:00
manifest.json	2.4.4	2016-06-23 12:56:14 -07:00
popup.html