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

13 years ago · 35d93a1f2c
parent d0848d4c3c cfa27b5cd1
commit 35d93a1f2c
3 changed files with 3 additions and 3 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
--- a/parts/appwizard/common/admin
+++ b/parts/appwizard/common/admin
@ -1 +1 @@
-Subproject commit 4af57bf22967e6ad80ab898980ed505df6eae5b0
+Subproject commit 06098efaf31973c11d7dd89ae291e6844b132e1a
		`@ -1 +1 @@`
			`Subproject commit 4af57bf22967e6ad80ab898980ed505df6eae5b0`				`Subproject commit 06098efaf31973c11d7dd89ae291e6844b132e1a`
		`@ -1 +1 @@`
			`Subproject commit d2f658ca47faefe569bcd1885b9238691fa13280`				`Subproject commit e47cc63e66a12ca6b740500b76f385336ee40dbc`