CityApper/wagtail_bakerydemo @ e5af9f234306842e094b0269770814b2cec4e556

spogulis no https://github.com/wagtail/bakerydemo.git

Scot Hacker e5af9f2343 Resolve conflict		8 gadi atpakaļ
..
images	e5af9f2343 Resolve conflict	8 gadi atpakaļ
original_images	e5af9f2343 Resolve conflict	8 gadi atpakaļ