diff options
author | Struan Donald <struan@exo.org.uk> | 2011-06-27 09:18:18 +0100 |
---|---|---|
committer | Struan Donald <struan@exo.org.uk> | 2011-06-27 09:18:18 +0100 |
commit | b483a17c13ba8e273949ce4ee8c8c05e66b06647 (patch) | |
tree | 3e928fa68c3edb90c0666ec52ad8c9982f9dab77 /perl-external | |
parent | 8deb709fa2d44bcbaba54734f7f4f4385980d8df (diff) | |
parent | 62ffebc89cc66d32a828ea1de8c850c3e950faa1 (diff) |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses
Conflicts:
perllib/FixMyStreet/DB/Result/Comment.pm
perllib/FixMyStreet/DB/Result/User.pm
web/css/core.css
Diffstat (limited to 'perl-external')
-rw-r--r-- | perl-external/files.txt | 5 | ||||
-rw-r--r-- | perl-external/minicpan/modules/02packages.details.txt.gz | bin | 20196 -> 20395 bytes | |||
-rw-r--r-- | perl-external/modules.txt | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/perl-external/files.txt b/perl-external/files.txt index fb5786aa8..f594e80af 100644 --- a/perl-external/files.txt +++ b/perl-external/files.txt @@ -161,6 +161,7 @@ /authors/id/M/MA/MAKAMAKA/JSON-PP-2.27105.tar.gz /authors/id/M/MA/MANU/Net-IP-1.25.tar.gz /authors/id/M/MA/MARKOV/MIME-Types-1.31.tar.gz +/authors/id/M/MA/MAUKE/Dir-Self-0.10.tar.gz /authors/id/M/MH/MHX/Devel-PPPort-3.19.tar.gz /authors/id/M/MI/MIROD/HTML-TreeBuilder-XPath-0.12.tar.gz /authors/id/M/MI/MIROD/XML-XPathEngine-0.12.tar.gz @@ -250,5 +251,9 @@ /authors/id/T/TU/TURNSTEP/DBD-Pg-2.18.1.tar.gz /authors/id/U/UL/ULPFR/Text-German-0.06.tar.gz /authors/id/V/VP/VPIT/Variable-Magic-0.46.tar.gz +/authors/id/W/WR/WREIS/DBIx-Class-EncodedColumn-0.00011.tar.gz /authors/id/X/XE/XERN/Lingua-PT-Stemmer-0.01.tar.gz /authors/id/Y/YV/YVES/ExtUtils-Install-1.54.tar.gz +/authors/id/Z/ZE/ZEFRAM/Class-Mix-0.004.tar.gz +/authors/id/Z/ZE/ZEFRAM/Crypt-Eksblowfish-0.009.tar.gz +/authors/id/Z/ZE/ZEFRAM/Params-Classify-0.013.tar.gz diff --git a/perl-external/minicpan/modules/02packages.details.txt.gz b/perl-external/minicpan/modules/02packages.details.txt.gz Binary files differindex dfe6e38ba..d78040bab 100644 --- a/perl-external/minicpan/modules/02packages.details.txt.gz +++ b/perl-external/minicpan/modules/02packages.details.txt.gz diff --git a/perl-external/modules.txt b/perl-external/modules.txt index 7b640c215..4568fc706 100644 --- a/perl-external/modules.txt +++ b/perl-external/modules.txt @@ -18,7 +18,9 @@ Catalyst::View::TT Class::Accessor Class::Unload Config::General +Crypt::Eksblowfish::Bcrypt DBIx::Class +DBIx::Class::EncodedColumn DBIx::Class::FilterColumn DBIx::Class::Schema::Loader DBIx::Class::Storage::DBI |