Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3 (40317cfd) · Commits · Karthikeyan / ISPConfig 3

Commit 40317cfd authored Nov 12, 2014 by

Till Brehm

Conflicts:
	interface/web/sites/lib/lang/de_web_folder_list.lng
	interface/web/sites/lib/lang/de_web_folder_user_list.lng

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Please register or to comment