rallytime 4baea26c58 Merge branch '2015.8' into '2016.3' ... Conflicts: - doc/topics/netapi/index.rst - salt/modules/win_servermanager.py - salt/modules/zypper.py		2016-02-20 12:27:41 -07:00
..
rest_cherrypy	Rename the rest_cherrypy tests to conform to our convention	2015-09-09 10:39:34 -06:00
rest_tornado	Merge branch '2015.8' into '2016.3'	2016-02-20 12:27:41 -07:00
__init__.py	Don't forget the blank lines at the end of the file	2015-04-24 16:29:51 -06:00