Commit 6bd1fa93 authored by 12people's avatar 12people

Merge branch 'master' of

parents 9b387677 aac5b8a1
......@@ -8,15 +8,13 @@ To get a general idea of the app, see this video:
ANYONE can contribute, no special skills required.
See the [Contribute](contribute) page for more info.
ANYONE can contribute, no special skills required. Message me on [Gitter]( if you'd like to help.
If you'd prefer to donate instead, you can donate through these:
- **[Liberapay](**
- **[Bountysource](**
- [Bountysource](
......@@ -15,6 +15,7 @@ import
import android.text.Html
import android.util.TypedValue
import android.view.View
import android.view.WindowManager
import com.enjoyingfoss.feeel.R
import com.enjoyingfoss.feeel.WorkoutContract
import com.enjoyingfoss.feeel.model.ExerciseMeta
......@@ -77,6 +78,8 @@ class WorkoutActivity : AppCompatActivity(), ServiceConnection, WorkoutContract.
if (controlsShown)
override fun onStart() {
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment