Merge branch 'master' into v/multi-decrypt

This commit is contained in:
Vincent Breitmoser committed 2015-06-18 13:19:44 +02:00
commit 0cfbe4ad06
4 files changed
+45 -27

No files matched your search

@@ -1332,5 +1332,6 @@
<string name="snack_compression_on">"Compression <b>enabled</b>."</string>
<string name="snack_compression_off">"Compression <b>disabled</b>."</string>
<string name="error_loading_keys">Error loading keys!</string>
<string name="error_empty_log">(error, empty log)</string>
</resources>