Merge branch 'master' of git.fsmpi.rwth-aachen.de:infra/ansible

50708e61 · Robin Sonnabend · Thomas Schneider · 7bb63606 · b9cf1dab · 50708e61
Commit 50708e61 authored 8 years ago by Robin Sonnabend Committed by Thomas Schneider 4 years ago
--- a/guest-overlay/files/provision/gast/.mozilla/firefox/iokxbme1.default/xulstore.json
+++ b/guest-overlay/files/provision/gast/.mozilla/firefox/iokxbme1.default/xulstore.json
--- a/guest-overlay/files/provision/gast/.mozilla/firefox/profiles.ini
+++ b/guest-overlay/files/provision/gast/.mozilla/firefox/profiles.ini
--- a/guest-overlay/files/provision/gast/.profile
+++ b/guest-overlay/files/provision/gast/.profile
--- a/guest-overlay/files/provision/gast/.zshrc
+++ b/guest-overlay/files/provision/gast/.zshrc
--- a/guest-overlay/files/provision/gast/Desktop/.directory
+++ b/guest-overlay/files/provision/gast/Desktop/.directory
--- a/guest-overlay/files/provision/gast/Desktop/schrank.desktop
+++ b/guest-overlay/files/provision/gast/Desktop/schrank.desktop
--- a/guest-overlay/tasks/main.yml
+++ b/guest-overlay/tasks/main.yml
--- a/guest-overlay/templates/lpoptions.j2
+++ b/guest-overlay/templates/lpoptions.j2