merged with niphlod

maxslimmer · Oct 3, 2016 · a9d3d31 · a9d3d31
2 parents cf9b2d8 + bcc237e
commit a9d3d31
Show file tree

Hide file tree

Showing 13 changed files with 1,389 additions and 572 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,8 +10,7 @@ python:
   - '3.5'
 
 install:
-  - if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then pip install pycrypto; fi;
-  - if [[ $TRAVIS_PYTHON_VERSION != '3.5' ]]; then pip install -e .; fi;
+  - pip install -e .
 
 before_script:
   - pip install coverage

diff --git a/README.markdown b/README.markdown
@@ -1,6 +1,6 @@
 ## Readme
 
-web2py is a free open source full-stack framework for rapid development of fast, scalable, secure and portable database-driven web-based applications. 
+web2py is a free open source full-stack framework for rapid development of fast, scalable, secure and portable database-driven web-based applications.
 
 It is written and programmable in Python. LGPLv3 License
 
@@ -10,7 +10,7 @@ Learn more at http://web2py.com
 
     cp examples/app.yaml ./
     cp handlers/gaehandler.py ./
-    
+
 Then edit ./app.yaml and replace "yourappname" with yourappname.
 
 ## Important reminder about this GIT repo