Merge branch 'Mario/itemstime_editor_fix' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 10 Mar 2017 17:37:24 +0000 (17:37 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 10 Mar 2017 17:37:24 +0000 (17:37 +0000)
commitcd60b2d7d720d0ccc580eecd3abf2a4768092aba
tree3d8fe416c862d5e299ec0bc098361485dd95aa95
parente0a14de12cfc534fe2ff3841e4bb5fac43088deb
parent2c8367ddfad046e02bbfc93556af1c7048516593
Merge branch 'Mario/itemstime_editor_fix' into 'master'

Merge branch Mario/itemstime_editor_fix (S merge request)

See merge request !415