myconfig

my config files
git clone https://a3nm.net/git/myconfig/
Log | Files | Refs | README

commit 5469f61505a40c0fbfefffcf55a8c0df9b9084d9
parent 23eac9e2f57ab0efa13e4e976483f56970044ae7
Author: Antoine Amarilli <a3nm@a3nm.net>
Date:   Mon, 30 Mar 2015 02:41:51 +0200

Merge branch 'master' of a3nm.net:git/myconfig

Conflicts:
	apt/external

Diffstat:
apt/external | 2--
apt/minimal | 3++-
apt/server | 6++++++
3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/apt/external b/apt/external @@ -1,5 +1,3 @@ # packages that must be installed separately -dropbox -python-gpgme # for dropbox skype:i386 steam-launcher diff --git a/apt/minimal b/apt/minimal @@ -77,4 +77,5 @@ dovecot-sieve gnupg-agent python python3 - +bindfs +iptables-persistent diff --git a/apt/server b/apt/server @@ -60,3 +60,9 @@ debsums trash-cli pbuilder etckeeper +stress +quota +quotatool +signing-party +ssmtp +cgroup-tools