Merge branch 'master' into spellcreation

12 years ago · cf0596c216
parent 025e820703 94f2937c8f
commit cf0596c216
1 changed files with 1 additions and 1 deletions
--- a/extern/shiny
+++ b/extern/shiny
@ -1 +1 @@
-Subproject commit ffd078843c11586107024ccbc2493d0ec2df896c
+Subproject commit f17c4ebab0e7a1f3bbb25fd9b3dbef2bd742536a