Serghey Rodin 704bf770f7 resolving repo conflicts

2016-06-25 11:07:06 +03:00

..

backup/exclusions

Revert "[SECURITY] Fix OS command injection."

2015-12-11 21:14:49 +02:00

cron

resolving repo conflicts

2016-06-25 11:07:06 +03:00

db

Revert "[SECURITY] Fix OS command injection."

2015-12-11 21:14:49 +02:00

dns

Revert "[SECURITY] Fix OS command injection."

2015-12-11 21:14:49 +02:00

file

FileManager bugfixes + file permission module

2016-06-24 16:36:59 +03:00

firewall

Revert "[SECURITY] Fix OS command injection."

2015-12-11 21:14:49 +02:00

ip

Revert "[SECURITY] Fix OS command injection."

2015-12-11 21:14:49 +02:00

mail

Flatta's security fixes from PullRequest #516

2015-12-11 21:32:07 +02:00

package

Revert "[SECURITY] Fix OS command injection."

2015-12-11 21:14:49 +02:00

server

Revert "[SECURITY] Fix OS command injection."

2015-12-11 21:14:49 +02:00

user

nameservers separated by comma

2016-06-24 17:40:50 +03:00

web

Flatta's security fixes from PullRequest #516

2015-12-11 21:32:07 +02:00