Merge remote-tracking branch 'refs/remotes/origin/master' into 2.1.0

# Conflicts:
#	bash/portal/install.sh
pull/186/head
Joe Prochazka 2016-05-10 12:50:40 -04:00
commit 794986a28d
1 zmienionych plików z 1 dodań i 0 usunięć

Wyświetl plik

@ -144,6 +144,7 @@ echo -e "\033[37m"
CheckPackage cron
CheckPackage collectd-core
CheckPackage rrdtool
CheckPackage postfix
CheckPackage lighttpd
# Check if this is Ubuntu 16.04 LTS.