Merge branch 'development' into master_joker
commit7607024bca5644f1ca9aed91189f95b1cb6016d7
authorkeldorkatarn <schmitta79@gmail.com>
Thu, 19 Apr 2018 21:05:58 +0000 (19 23:05 +0200)
committerkeldorkatarn <schmitta79@gmail.com>
Thu, 19 Apr 2018 21:05:58 +0000 (19 23:05 +0200)
tree743a254cef8f9dbd1b062cd2e073e3f853b9cbd0
parente2f46541821bd901728268a622f51d4daba5a14b
parentd836eaa6a989a75b0185c6a2e992c09c9169fff6
Merge branch 'development' into master_joker