Commit d51411f6 authored by kberry's avatar kberry
Browse files

Merge branch 'matching'

parents bb5c3537 e6569a4b

AUTHORS.rst

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Development Team 


* Jay Laura <jlaura@usgs.gov>

* Kristin Berry <kberry@usgs.gov>

* Jeannie Backer <jwbacker@usgs.gov>

* Dyer Lytle <dmlytle@usgs.gov>

* Jeannie Backer <jwbacker@usgs.gov>

CONTRIBUTING.rst

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ articles, and such. 
Submit Feedback

~~~~~~~~~~~~~~~



The best way to send feedback is to file an issue at https://github.com/jlaura@usgs.gov/autocnet/issues.

The best way to send feedback is to file an issue at https://github.com/USGS-Astrogeology/autocnet/issues.



If you are proposing a feature:
@@ -100,7 +100,7 @@ Before you submit a pull request, check that it meets these guidelines: 
   your new functionality into a function with a docstring, and add the

   feature to the list in README.rst.

3. The pull request should work for Python 2.6, 2.7, 3.3, and 3.4, and for PyPy. Check

   https://travis-ci.org/jlaura@usgs.gov/autocnet/pull_requests

   https://travis-ci.org/USGS-Astrogeology/autocnet/pull_requests

   and make sure that the tests pass for all supported Python versions.



Tips

README.rst

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 
AutoCNet

===============================



.. image:: https://badges.gitter.im/USGS-Astrogeology/autocnet.svg

   :alt: Join the chat at https://gitter.im/USGS-Astrogeology/autocnet

   :target: https://gitter.im/USGS-Astrogeology/autocnet?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge



.. image:: https://img.shields.io/pypi/v/autocnet.svg

        :target: https://pypi.python.org/pypi/autocnet