Nikita Sinelnikov 355f733a3b Merge branch 'master' of github.com:ultimatemember/ultimatemember ...

# Conflicts:
#	assets/js/dropdown.min.js
#	assets/js/simplebar.min.js
#	assets/js/um-conditional.min.js
#	assets/js/um-crop.min.js
#	assets/js/um-fileupload.min.js
#	assets/js/um-functions.min.js
#	assets/js/um-jquery-form.min.js
#	assets/js/um-members.min.js
#	assets/js/um-scripts.min.js

2021-06-24 12:42:14 +03:00

..

css

- fixed select2 dropdown window position;

2021-03-10 02:52:52 +02:00

dynamic_css

- added ability to set cover/avatar size from predefined sizes in Ultimate Member -> Settings -> General -> Uploads;

2019-10-10 17:22:24 +03:00

font

- FontAwesome new version;

2017-08-06 21:55:09 +03:00

img

- removed Instagram extension's image;

2020-10-29 23:03:51 +02:00

js

Merge branch 'master' of github.com:ultimatemember/ultimatemember

2021-06-24 12:42:14 +03:00

sass

- fixed select2 dropdown window position;

2021-03-10 02:52:52 +02:00