Skip to content
This repository has been archived by the owner on Apr 28, 2020. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'hotfix/5942' into develop

* hotfix/5942:
  [zendframework/zendframework#5942] skip some tests when ext/intl is not present
  Use --prefer-source flag for composer
  [zendframework/zendframework#5942] Ensure TranslatorServiceFactory remains BC with < 2.3.0
  • Loading branch information
Ralph Schindler committed Mar 11, 2014
208 parents 2278ace + 97bdfb2 + 230d179 + 4b3564f + b544f2c + 7e095bb + 2e09fbd + 385463e + 493e8bf + 8accc42 + c0d425a + 278e5fc + f2f9883 + ee610ed + ef00595 + 546ed4b + 1e282f1 + 5a0e97e + 9b1b995 + 1f178dc + 19afffe + 3b1a256 + a01e488 + 6bd5417 + 7884984 + d7ead03 + ad447f0 + 30abd77 + 886c7dd + 0426e59 + 41bb0b6 + 48830b0 + d6e3cec + 3f64575 + 47056cf + 93da274 + 41ff6ee + 4d95164 + b49f56a + d9ca3c4 + eff94af + baa6f68 + b8d6e5f + cf90e76 + a38e673 + ddc5b11 + 203f4f2 + f755a1b + 7b4bdc5 + de1dabc + cffd7da + e68b46a + 6a4a61e + a495238 + 22ee4fd + 7c48789 + 88fc985 + 33867a8 + 72cc708 + 1253b9d + b527198 + 9f385cb + 9681d38 + 9ff4ea7 + 9dcc02b + a3b5a44 + 49aa6e1 + 785d144 + 6cb9145 + 98ba294 + 1a26005 + 6a37670 + 53069e2 + cdc28f8 + 7ed9b6d + 6aa8b3f + b08f0db + c6ffcad + 2e788ed + 5fa8668 + 331098b + 11a5300 + d15662e + a652577 + 113da58 + ac8c434 + 51dd55f + b8f65f9 + 5ab3ccd + 3c9d616 + 34eee47 + 1fc6a29 + 0f06888 + 781c1e1 + bfb1248 + adb0888 + 20476b6 + f0f3028 + fd934a8 + 039bd26 + 70f3e5a + 3d9849b + 118afdb + 029c839 + 31a4435 + fa239e0 + 18c2969 + 28b9d7b + 34e166a + 9e19c9d + 1645624 + 0f36602 + 32da7d8 + 9cd65f3 + 10a2ceb + f8a3f38 + 7b59c4b + 281109c + e15b4b2 + 00a7ba9 + d3f35c0 + e89516e + cbf495f + 89118d6 + 4f9b8b7 + d51ad32 + bdfd7d8 + 0dc32e4 + ca27a0e + b0b5deb + 8f5f165 + e85eb90 + 8f6f830 + 6a31d61 + 54ae670 + 1cad3f0 + beb876e + d725de0 + bf57c7d + 822964a + 669aa66 + 76422ec + 62cdf38 + cbe43a2 + 6b3919c + 832c96f + 72e3bd6 + 5cfa5d3 + f012f21 + 49e3436 + 465b2ed + 91cc8bb + 86b4350 + e32c680 + d82c755 + b9aa141 + ab2eabe + dc44bfd + b6b709b + a532720 + da21aec + c5778b9 + 0c4bddf + 2949069 + 32cca05 + 351e176 + ae57563 + aaa4dad + 8002f21 + 8609d03 + 81091aa + 1abecc5 + 99e065a + be2b2d8 + 4043721 + 4b52b1f + adf262d + 1c20c0f + f380ca1 + a14332b + ccca4d8 + 0db0a30 + ba85cb6 + 276f386 + cad56d4 + 39a0907 + 274bf4b + 46e1399 + 1bd4778 + a77acd1 + 4150f70 + d64372e + 98140e2 + 644aaca + 3d36336 + 4f41436 + a236441 + 68306b6 + 61bb631 + 3b79484 + f931aa2 + 4c17dd5 + 427103d + 8be13fb + 4290548 + cc5432c + 3326d35 + 4f9a730 commit 32a5624
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ php:

install:
- sudo apt-get install parallel
- composer install --dev
- composer install --dev --prefer-source

before_script:
- mkdir -p build/coverage
Expand Down

0 comments on commit 32a5624

Please sign in to comment.