Merge 61f8287f6f2b5867fb02be4ce1b24c3c2425a4d3 into…

Authored by Lukas Erlacher <l.erlacher@googlemail.com> on Sat, Feb 9, 11:41 AM.

Details

Committed
GitHub <noreply@github.com>Sat, Feb 9, 11:41 AM
Parents
rR641a67fe756b: Elastic: Fix unintentional layout preference overwrite (#6613)
rR61f8287f6f2b: Implement user and contact import
Branches
Unknown
Tags
Unknown
References
refs/pull/5565/merge
GitHub <noreply@github.com> committed rRf38d253ec032: Merge 61f8287f6f2b5867fb02be4ce1b24c3c2425a4d3 into… (authored by Lukas Erlacher <l.erlacher@googlemail.com>).Sat, Feb 9, 11:41 AM

Merged Changes

CommitAuthorDetailsCommitted
61f8287f6f2bLukas Erlacher
Implement user and contact import 
Dec 20 2016
4e5d959f1d0aLukas Erlacher
WIP - Add user import script 
Dec 16 2016
a85155356b39Lukas Erlacher
Add line-based json output 
Dec 15 2016
8061e2ae4909Lukas Erlacher
Add searches, dictionary, file header 
Dec 15 2016
faa9ededd34bLukas Erlacher
Add user export script 
Dec 15 2016