Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
Conflicts: interface/web/sites/lib/lang/de_web_folder_list.lng interface/web/sites/lib/lang/de_web_folder_user_list.lng
Please register or sign in to comment
Conflicts: interface/web/sites/lib/lang/de_web_folder_list.lng interface/web/sites/lib/lang/de_web_folder_user_list.lng