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

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

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

..

assets

- multisite users creation fixes;

2017-11-26 13:16:43 +02:00

core

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

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

templates

- options optimization;

2017-12-12 11:13:02 +02:00

class-admin.php

- settings optimization;

2017-12-11 09:53:38 +02:00