Merge branch 'master' of https://github.com/ultimatemember/ultimatemember into fix/wpml_emails_templates

Browse Source

Conflicts:
	includes/um-deprecated-functions.php
	includes/um-short-functions.php

...

This commit is contained in:

nikitozzzzzzz

2017-12-19 14:47:47 +02:00

parent f861de65a8 ef9c06185b

commit b9ecb63cb3

41 changed files with 4928 additions and 4513 deletions

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

Download Patch File Download Diff File Expand all files Collapse all files

includes/um-short-functions.php

+1730 -1726

File diff suppressed because it is too large Load Diff