diff options
author | Parménides GV <parmegv@sdf.org> | 2014-06-26 10:06:17 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2014-06-26 10:06:17 +0200 |
commit | e323a3015bbc14579cff40e044995ed47039a64e (patch) | |
tree | 8139555a56f59bcf5391e70444556520d99e42f1 /app/src/main/java/de/blinkt | |
parent | adfcb7f7a0586cb1ea21c531b5560ff20e0e486b (diff) | |
parent | b25a1f5299760b078962fa7e2c05ecdb50497311 (diff) |
Merge branch 'develop' into release-0.5.3
Diffstat (limited to 'app/src/main/java/de/blinkt')
0 files changed, 0 insertions, 0 deletions