RicomenPL a5ad57cfde Merge branch 'grid-marks' ...

# Conflicts:
#	app/src/main/java/io/github/wulkanowy/activity/main/Login.java
#	app/src/main/java/io/github/wulkanowy/activity/main/MainActivity.java

2017-07-21 20:11:28 +02:00

..

src

Merge branch 'grid-marks'

2017-07-21 20:11:28 +02:00

.gitignore

Started activity and icon

2017-03-09 21:29:23 +01:00

build.gradle

Merge branch 'grid-marks'

2017-07-21 20:11:28 +02:00

proguard-rules.pro

Started activity and icon

2017-03-09 21:29:23 +01:00