# [#30361] Chosen minified and un-minified versions are different.
Thanks Roberto
 # [#30348] Popular Tags Module showing multiple copies of links. Thanks
Elin
Merge remote-tracking branch 'remotes/upstream/master' into dbsyntax

Conflicts:
	modules/mod_tags_popular/helper.php
Fixed conflicts with merge