Merge branch 'master' into Applications/18.12

Authored by sdepiets on Dec 5 2018, 12:13 PM.

Description

Merge branch 'master' into Applications/18.12

Details

Committed
sdepietsDec 5 2018, 12:13 PM
Parents
R456:e6dbc35df72b: Revert to 18.12 with no docbook change
R456:7922b3a4579c: Bump to 18.12
Branches
Unknown
Tags
Unknown
References
tag: v18.12.0

Merged Changes

CommitAuthorDetailsCommitted
e6dbc35df72bsdepiets
Revert to 18.12 with no docbook change 
Dec 5 2018
6a564ff49afeD17364sdepiets
Bump lokalize version to 18.12 
Dec 5 2018