Merge remote-tracking branch 'mortada/master' into get_series_with_realtime

elmotec · elmotec · commit ef78d833fd60 · 2015-10-01T05:23:46.000-04:00
Conflicts:
	fredapi/tests/__init__.py
diff --git a/fredapi/tests/__init__.py b/fredapi/tests/__init__.py
@@ -1 +1 @@
-# This file is needed by Python 2.7 to figure that tests is a package.
+""" this file is needed for python to consider this directory a module """

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-# This file is needed by Python 2.7 to figure that tests is a package.`
	`1`	`+""" this file is needed for python to consider this directory a module """`