Edgardo Palza e57a523e17 Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons into Ohne_Drag_and_Drop 8 anni fa
..
controller b429bd829c merge fix 8 anni fa
model 908ef93e0d GlobalVariables in Model 8 anni fa
view e57a523e17 Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons into Ohne_Drag_and_Drop 8 anni fa