Commit ceefce1d authored by jay's avatar jay
Browse files

Merge remote-tracking branch 'upstream/master'

parents 152f06da 9d9fca6a

.travis.yml

+3 −1
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ notifications: 
    email:

        recipients:

            - jlaura@usgs.gov

            - kberry@usgs.gov

            - dmlytle@usgs.gov

        on_success: always

        on_failure: always

AUTHORS.rst

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ Development Team 
----------------



* Jay Laura <jlaura@usgs.gov>

* Kristin Berry <kberry@usgs.gov>

* Dyer Lytle <dmlytle@usgs.gov>



Contributors

------------