Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kiosktool

13 years ago · f0addefd07
parent 43508d556d 8b6ac27d6c
commit f0addefd07
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 4af57bf22967e6ad80ab898980ed505df6eae5b0
+Subproject commit 06098efaf31973c11d7dd89ae291e6844b132e1a
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit d2f658ca47faefe569bcd1885b9238691fa13280
+Subproject commit e47cc63e66a12ca6b740500b76f385336ee40dbc