Commit Graph

15 Commits

Author SHA1 Message Date
Johannes Theiner cd404f122d
Merge branch 'master' of gitea.joethei.xyz:Studium/Produktion_Digitaler_Medien 2020-10-27 13:51:41 +01:00
theOneEmployee 76408194ce Merge branch 'master' of https://gitea.joethei.xyz/Studium/Produktion_Digitaler_Medien into master 2020-10-27 12:53:47 +01:00
theOneEmployee 1c46af7909 Please enter the commit message for your changes. Lines starting 2020-10-27 12:29:44 +01:00
Johannes Theiner c31bf1ae1d
added bunker and factory assets 2020-10-27 12:21:39 +01:00
Johannes Theiner 971766535b
testing 2020-10-27 11:53:22 +01:00
Johannes Theiner 77a64a7312
resolving conflict manual 2020-10-22 18:02:17 +02:00
Johannes Theiner 8da5cfbf09
first lfs commit 2020-10-22 14:04:05 +02:00
theOneEmployee 4f0d4126ff update 2020-10-22 13:31:13 +02:00
theOneEmployee 6cc37aadd6 aaaaaaaahhh 2020-10-20 17:15:33 +02:00
theOneEmployee 362462a350 new changelist 2020-10-20 14:15:12 +02:00
theOneEmployee af2e405e2c test area hinzugefügt 2020-10-15 15:31:48 +02:00
theOneEmployee d8cb14a390 unnötiges material 2020-10-12 15:14:54 +02:00
theOneEmployee b7b63cb14b delete test 2020-10-08 15:51:30 +02:00
theOneEmployee cb87324ebc new blueprint test 2020-10-08 15:50:21 +02:00
theOneEmployee 8c1bfa9f75 Initial commit 2020-10-08 15:33:58 +02:00