Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb

Browse source

Conflicts:
	mamweb/static/images/header-bg-uvod-NOC.png

...

This commit is contained in:

Matěj Kocián 2015-09-24 12:10:30 +02:00

parent 0b0216ac5b 9f9af3a82a

commit 708da4bf99

1 changed files with 0 additions and 0 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

mamweb/static/images/header-bg-uvod-NOC.jpg

View file

Binary file not shown.

Side by side Swipe Before (image error) Size: 41 KiB After (image error) Size: 42 KiB