Merge remote-tracking branch 'origin/master' into develop · adamradocz/WordPress-Plugin-Template@cda3362 · GitHub

Commit

Merge remote-tracking branch 'origin/master' into develop

Browse files

Conflicts:
	ChangeLog.md
	README.md
	plugin-name/admin/class-plugin-name-admin.php
	plugin-name/plugin-name.php
	plugin-name/public/class-plugin-name.php
	plugin-name/trunk/README.txt
	plugin-name/uninstall.php

Loading branch information

tommcfarlin committed Sep 2, 2014

2 parents c3c95e0 + 0694bf9 commit cda3362