diff options
| author | Christian S <christian@pix-art.de> | 2015-10-26 09:22:49 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-10-26 09:22:49 +0100 |
| commit | 107acd1a5b03d25aa38d1ad73b957482ea781035 (patch) | |
| tree | bdca209c2be191f8050e03fbe64d01d1011a6210 /src/main/res/values | |
| parent | 2c179a1d41c50f74049ed794bcb1dfdb7de30870 (diff) | |
| parent | d4877177b7b8b14a70a0826fd182b8f9598607b0 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
Diffstat (limited to 'src/main/res/values')
0 files changed, 0 insertions, 0 deletions