Merge branch 'stg-2.409'

author Maksym Mamontov <madf@madf.info>

Wed, 1 Jan 2020 19:11:53 +0000 (21:11 +0200)

committer Maksym Mamontov <madf@madf.info>

Wed, 1 Jan 2020 19:11:53 +0000 (21:11 +0200)
author Maksym Mamontov <madf@madf.info>
Wed, 1 Jan 2020 19:11:53 +0000 (21:11 +0200)
committer Maksym Mamontov <madf@madf.info>
Wed, 1 Jan 2020 19:11:53 +0000 (21:11 +0200)
diff --cc projects/stargazer/plugins/store/firebird/firebird_store_users.cpp
Simple merge
diff --cc projects/stargazer/plugins/store/postgresql/postgresql_store_users.cpp
Simple merge
diff --cc projects/stargazer/user_impl.cpp
Simple merge
author	Maksym Mamontov <madf@madf.info>
	Wed, 1 Jan 2020 19:11:53 +0000 (21:11 +0200)
committer	Maksym Mamontov <madf@madf.info>
	Wed, 1 Jan 2020 19:11:53 +0000 (21:11 +0200)
		1	2
projects/stargazer/plugins/store/firebird/firebird_store_users.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
projects/stargazer/plugins/store/postgresql/postgresql_store_users.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
projects/stargazer/user_impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history