Merge branch 'release-1.5.0' into develop

This commit is contained in:
Kerrick Long
2012-04-30 10:16:35 -05:00
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "Mostly Harmless",
"version": "1.4.1",
"version": "1.5.0",
"description": "Find, vote on, save, hide, and report links on reddit; submit new links; These and more! http://kerrick.github.com/Mostly-Harmless",
"browser_action": {
"default_icon": "pix/alien.png",
@@ -19,4 +19,4 @@
"background_page": "html/background.html",
"options_page": "fancy-settings/index.html",
"default_locale": "en_US"
}
}