Merge branch 'master' of github.com:manavortex/FurnitureCatalogue

Author git <vivec@telvanni.eu>
Author date 2018-06-14 16:45:35
Author local date 2018-06-14 18:45:35 +0200
Committer git <vivec@telvanni.eu>
Committer date 2018-06-14 16:45:35
Committer local date 2018-06-14 18:45:35 +0200
Commit 7748d41ae45b78f9d4fe87d368ccb6fafca469ba
Tree 6aba5fcbad1e4c3708acc0863770ee118f35c9ec
Parent 2f80005eb5b543ad628d59b7e0ae36267c8b8c4a
Parent d68d8e9446d4a36da648980f681cf1cc5dea605e
Merge branch 'master' of github.com:manavortex/FurnitureCatalogue