Permalink
Browse files

bug 810386: proper timezone selection in Settings and FTU, r=21

  • Loading branch information...
1 parent 409c7c0 commit daf11ccdf3ee032623c5f5bfd99d3d7bf407629f @fabi1cazenave fabi1cazenave committed Nov 29, 2012
Showing with 1 addition and 574 deletions.
  1. +1 −2 apps/settings/index.html
  2. +0 −572 shared/resources/timezones.json
View
@@ -23,8 +23,8 @@
<link rel="stylesheet" type="text/css" href="style/updates.css"/>
<!-- Shared resources
+ <link rel="resource" type="application/json" href="shared/resources/tz.json"/>
<link rel="resource" type="application/json" href="shared/resources/apn.json"/>
- <link rel="resource" type="application/json" href="shared/resources/timezones.json"/>
<link rel="resource" type="application/json" href="shared/resources/languages.json"/>
-->
@@ -34,7 +34,6 @@
<link rel="resource" type="application/l10n" href="shared/locales/date.ini"/>
<link rel="resource" type="application/l10n" href="shared/locales/permissions.ini"/>
<link rel="resource" type="application/l10n" href="shared/locales/tz.ini"/>
- <link rel="resource" type="application/json" href="shared/resources/tz.json"/>
<script type="application/javascript" src="shared/js/l10n.js"></script>
<script type="application/javascript" src="shared/js/l10n_date.js"></script>
Oops, something went wrong.

0 comments on commit daf11cc

Please sign in to comment.