jannis eea30747cd Merge branch 'master' into feature-unit_systems ...

# Conflicts:
#	app/src/main/java/de/tadris/fitness/WorkoutAdapter.java

2019-08-20 18:00:39 +02:00

..

libs

Delete Workouts, Recording Information, Automtic pause, GPX-library added for future export

2019-08-18 15:53:58 +02:00

src

Merge branch 'master' into feature-unit_systems

2019-08-20 18:00:39 +02:00

build.gradle

choose workout type

2019-08-18 20:54:30 +02:00

proguard-rules.pro

Initial commit

2019-08-14 10:11:03 +02:00