summaryrefslogtreecommitdiff
path: root/res/values
diff options
context:
space:
mode:
authorSean Leonard <meanderingcode@aetherislands.net>2013-07-12 14:28:46 -0600
committerSean Leonard <meanderingcode@aetherislands.net>2013-07-12 14:28:46 -0600
commit1d1b3a18da29a17ffb983aa5439659970fe0ab83 (patch)
tree336d9904bafdd66db350401090b12a6cde5ed885 /res/values
parent8bd4d61319b1418e5fef2d9f932044b07bfc1f20 (diff)
parent652d0e84785b89ac13c0fc03663ce0e2811aea6b (diff)
Merge branch 'feature/login-logout-options-shown-when-applicable' into develop
Diffstat (limited to 'res/values')
0 files changed, 0 insertions, 0 deletions