Merge branch 'master' of https://git.it-syndikat.org/IT-Syndikat/rc3-its-assembly-2021.git

Browse source

# Conflicts:
#	main.json --> choose remote

...

This commit is contained in:

Gerhard Aigner 2021-12-30 02:15:42 +01:00

parent 18be5ad6fa a959660ae3

commit 022eec0ca5

3 changed files with 102 additions and 15 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

BIN

image-sources/its-misc.kra Normal file

View file

Binary file not shown.

BIN

its-misc.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4 KiB

117

main.json

View file

File diff suppressed because one or more lines are too long