summaryrefslogtreecommitdiff
path: root/res/values-ja/strings.xml
diff options
context:
space:
mode:
authorSean Leonard <meanderingcode@aetherislands.net>2014-03-12 13:27:16 -0700
committerSean Leonard <meanderingcode@aetherislands.net>2014-03-12 13:27:16 -0700
commitc57c4d06541616e5843c0df738a95e8f16ec5693 (patch)
treea050e2b5f81fb3dd37476da1059a3372b982b31d /res/values-ja/strings.xml
parent6a02a96946393956031dc2d0223fe8c0ebe7db37 (diff)
parent87826ce5c276489d74b37618b9d534b32e446eca (diff)
Merge branch 'bug/dying-client-during-configuration-5237' into develop
Diffstat (limited to 'res/values-ja/strings.xml')
0 files changed, 0 insertions, 0 deletions