Merge branch 'dev' of https://github.com/andrewlimaza/paid-membership… · messica/paid-memberships-pro@3ca71f5 · GitHub

Commit

Merge branch 'dev' of https://github.com/andrewlimaza/paid-membership…

Browse files

…s-pro into andrewlimaza-dev

Conflicts:
	adminpages/discountcodes.php

Loading branch information

ideadude committed Jan 24, 2017

2 parents 8d2900d + 5573611 commit 3ca71f5