Merge branch 'master' of https://github.com/tommcfarlin/WordPress-Plugin-Boilerplate

Browse source

Signed-off-by: Tom McFarlin <tom@tommcfarlin.com>

Conflicts:
	plugin-name/public/class-plugin-name.php

...

This commit is contained in:

Tom McFarlin 2013-11-19 17:25:19 -05:00

parent 01319c57e3 ce5d816a4d

commit 34ec83fc6c

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