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

Browse source

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

...

This commit is contained in:

Tom McFarlin 2014-09-01 20:42:08 -04:00

parent c3c95e0a81 0694bf9302

commit cda33620e7

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available