diff options
author | cyBerta <richy@cyborgsociety.org> | 2014-03-18 12:18:23 +0100 |
---|---|---|
committer | cyBerta <richy@cyborgsociety.org> | 2014-03-18 12:18:23 +0100 |
commit | bb503590fc648e6b97f0f2b95156d4179cc33a11 (patch) | |
tree | bcbf8d58eec1eb3b0a6de486a1a88c553ee0c17f /res/values-fr/strings.xml | |
parent | 608653a64648fd6d7e37987ee4a160a3dd68f775 (diff) | |
parent | 1df967637d432bccc405f0a2e7ce46dc236cffff (diff) |
Merge branch 'bug/connection-to-calyx.net-fails-and-app-crashes-#4550' into develop
Diffstat (limited to 'res/values-fr/strings.xml')
0 files changed, 0 insertions, 0 deletions