Commit Graph

5 Commits

Author SHA1 Message Date
Mischa ter Smitten c8bb148084 Merge remote-tracking branch 'origin/master' into micha 2017-01-12 14:07:35 +01:00
Mischa ter Smitten 8e9702d049 Merge remote-tracking branch 'upstream/master' into micha 2017-01-12 09:44:14 +01:00
Mischa ter Smitten 93c62b836d Fix for failing apt-get dist-upgrade 2017-01-12 09:31:23 +01:00
Kevin van Zonneveld 598ca78fa7 Upgrade Frey to v0.3.27 /cc @tersmitten (#85)
* Upgrade Frey to v0.3.27 /cc @tersmitten

* Add forgotten and misspelled role variables

* Make it easier to override settings and clear that this is a private file
2017-01-11 10:25:28 +01:00
Mischa ter Smitten ca5fbcc7f8 Merge remote-tracking branch 'upstream/master' into micha 2016-12-27 22:38:09 +01:00