[yast-commit] [yast/yast-storage] 4c4bd3: Merge remote-tracking branch 'origin/SLE-12-SP2-CA...

Branch: refs/heads/bsc-1049108-SLE12-SP3 Home: https://github.com/yast/yast-storage Commit: 4c4bd3e11704537d321988727cfcb5f68042e612 https://github.com/yast/yast-storage/commit/4c4bd3e11704537d321988727cfcb5f6... Author: Arvin Schnell Date: 2017-07-20 (Thu, 20 Jul 2017) Changed paths: M package/yast2-storage.changes M package/yast2-storage.spec M src/modules/StorageProposal.rb Log Message: ----------- Merge remote-tracking branch 'origin/SLE-12-SP2-CASP' into bsc-1049108-SLE12-SP3 # Conflicts: # .travis.yml # package/yast2-storage.changes # package/yast2-storage.spec