diff options
| author | kali <kali@leap.se> | 2014-08-08 19:10:39 -0500 |
|---|---|---|
| committer | kali <kali@leap.se> | 2014-08-08 19:10:39 -0500 |
| commit | cef0be0b4f866c9283eaf696fbc23b8120e40443 (patch) | |
| tree | ff54448f7354e56235d22dabaf0fb03597790c98 /data/resources/eipstatus.qrc | |
| parent | a9173e8e2816b767028787735e4a84b2576f258d (diff) | |
| parent | 465c0b89ca61279eb036afec2de3b4d24b257311 (diff) | |
Merge branch '0.6.1-rc' into deb-0.6.1-rc
Conflicts:
pkg/linux/bitmask-root
src/leap/bitmask/gui/login.py
Diffstat (limited to 'data/resources/eipstatus.qrc')
0 files changed, 0 insertions, 0 deletions