tMerge pull request #1292 from romanz/master - electrum - Electrum Bitcoin wallet
  HTML git clone https://git.parazyd.org/electrum
   DIR Log
   DIR Files
   DIR Refs
   DIR Submodules
       ---
   DIR commit bb4d175978ac39f5e6c89dc827b9d1975d283dae
   DIR parent c46ac26d828f336a8dc06dbae3a37325c58370af
  HTML Author: ThomasV <electrumdev@gmail.com>
       Date:   Fri, 12 Jun 2015 12:25:12 +0200
       
       Merge pull request #1292 from romanz/master
       
       ttravis.yml: add protobuf to requirements and exclude plugins
       Diffstat:
         M .travis.yml                         |       4 ++--
       
       1 file changed, 2 insertions(+), 2 deletions(-)
       ---
   DIR diff --git a/.travis.yml b/.travis.yml
       t@@ -2,5 +2,5 @@ sudo: false
        language: python
        python:
            - "2.7"
       -install: "pip install slowaes==0.1a1 ecdsa>=0.9 pbkdf2 requests pyasn1 pyasn1-modules tlslite>=0.4.5 qrcode SocksiPy-branch"
       -script: nosetests -e gui
       +install: "pip install slowaes==0.1a1 ecdsa>=0.9 pbkdf2 requests pyasn1 pyasn1-modules tlslite>=0.4.5 qrcode SocksiPy-branch protobuf"
       +script: nosetests -e gui -e plugins