Commit Graph

2 Commits (ae22100db9172951c37ce49c0af7a92394aeaa58)

Author SHA1 Message Date
Julius Riegel 9a8f83f4ac Merge branch 'master' of https://bitbucket.org/trivernis/spydian into release/Alpha-1.0.3
# Conflicts:
#	.idea/für Robotototo.iml
#	.idea/misc.xml
#	.idea/workspace.xml
7 years ago
Trivernis c266d6c6c6 - changed git settings 7 years ago