nikitasinelnikov 4a69f125cf Merge branch 'master' of https://github.com/ultimatemember/ultimatemember into feature/map_layout ...

# Conflicts:
#	assets/js/um-members.min.js

2019-12-12 14:46:20 +02:00

..

css

- fixed JS results template;

2019-12-11 12:34:17 +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

- added Profile Tabs licenses integration;

2019-12-10 14:04:13 +02:00

js

Merge branch 'master' of https://github.com/ultimatemember/ultimatemember into feature/map_layout

2019-12-12 14:46:20 +02:00

sass

- fixed JS results template;

2019-12-11 12:34:17 +02:00