Hailee Kenney fa8af6693d (maint) Fix incorrectly resolved merge conflict ... Due to a merge conflict that was not properly resolved, a method which did not exist was being called in the server action, causing the action to fail. Remove the unneeded method call so that the server action will work as intended.		2014-10-01 11:32:12 -07:00
..
puppet	(maint) Fix incorrectly resolved merge conflict	2014-10-01 11:32:12 -07:00
puppetx/puppetlabs	(PDOC-3) Relocate plugin configuration	2014-09-30 14:21:20 -07:00