Merge branch 'v1-release' into master

marcotcr · May 5, 2017 · 9716bf5 · 9716bf5
2 parents 8640e76 + 01d65a3
commit 9716bf5
Show file tree

Hide file tree

Showing 10 changed files with 2,247 additions and 1,635 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,3 +15,4 @@ install:
 script:
   - py.test lime
   - flake8 lime
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,3 +15,4 @@ install:
		script:
		- py.test lime
		- flake8 lime