jannis a336015818 Merge branch 'feature-manual-workouts' ...

# Conflicts:
#	app/src/main/AndroidManifest.xml

2020-03-10 21:15:00 +01:00

..

activity

Merge branch 'feature-manual-workouts'

2020-03-10 21:15:00 +01:00

data

#53 Manually add workouts

2020-03-10 21:13:15 +01:00

dialog

#53 Manually add workouts

2020-03-10 21:13:15 +01:00

export

#29 Option to save backup to internal storage

2020-01-09 16:25:46 +01:00

map

#53 Manually add workouts

2020-03-10 21:13:15 +01:00

osm

Clear access token of not valid anymore

2020-01-08 12:37:45 +01:00

recording

Merge branch 'feature-manual-workouts'

2020-03-10 21:15:00 +01:00

util

#53 Manually add workouts

2020-03-10 21:13:15 +01:00

view

#53 Manually add workouts

2020-03-10 21:13:15 +01:00

Instance.java

#53 Manually add workouts

2020-03-10 21:13:15 +01:00