Merge branch 'locked_user.js'
commit6a4223debd6d8bcdf47d5eb0ad971b2c344a066a
authorpyllyukko <pyllyukko@maimed.org>
Tue, 23 Jan 2018 21:22:51 +0000 (23 23:22 +0200)
committerpyllyukko <pyllyukko@maimed.org>
Tue, 23 Jan 2018 21:22:51 +0000 (23 23:22 +0200)
tree4340dd2c3e5d293cd341efd95d612b82fc2a1374
parent597077e2b57e30cb26cb57f2d311b9597b32513d
parent28a178204562e5f8769fd530aefc3da0c31d4f14
Merge branch 'locked_user.js'

Closes #363