[freeside-commits] branch FREESIDE_3_BRANCH updated. 85f0e2caa759102f68fe28278faf5f65c7b33b3c

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  85f0e2caa759102f68fe28278faf5f65c7b33b3c (commit)
       via  f8f4e8e6fd26a0abe8bca4fe6dd1b70b80b55a25 (commit)
      from  0757f503bd30a99edddb6b18fed8ff00c9e91df8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 85f0e2caa759102f68fe28278faf5f65c7b33b3c
Merge: f8f4e8e 0757f50
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Jul 17 11:46:37 2015 -0700

    Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH


commit f8f4e8e6fd26a0abe8bca4fe6dd1b70b80b55a25
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Jul 17 11:44:22 2015 -0700

    allow en_US as an available-locale in v3, RT#37311

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 4389904..b5d4be6 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -5764,7 +5764,6 @@ and customer address. Include units.',
     'multiple'    => 1,
     'options_sub' => sub { 
       map { $_ => FS::Locales->description($_) }
-      grep { $_ ne 'en_US' } 
       FS::Locales->locales;
     },
     'option_sub'  => sub { FS::Locales->description(shift) },

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Conf.pm |    1 -
 1 file changed, 1 deletion(-)