Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/masterRemote' into masterRemote
Browse files Browse the repository at this point in the history
  • Loading branch information
senpl committed Jun 22, 2020
2 parents d68e796 + 1e2a5ea commit 6ff0b90
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
![FastNFitness Logo](https://lh3.googleusercontent.com/KKJw0HA9fD2g9mZMhzzeretD4Tvkr7-wPVzl7WMTTXiiqO6ikS5SqR5X9E8i2HPrNQ=w300)
# Welcome to the FastNFitness wiki!
# Welcome to the FastNFitness next wiki!

[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
alt="Get it on F-Droid"
height="80">](https://f-droid.org/packages/com.easyfitness/)
[<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
alt="Get it on Google Play"
height="80">](https://play.google.com/store/apps/details?id=com.easyfitness)

## Track your progress (power lifting and fitness) quickly and easily
## Track your progress quickly and easily

Now you can track your progress easily and quickly!
You can create as many machines as you want with the name you want!
Expand Down Expand Up @@ -51,7 +48,7 @@ See [Contributing.md](/Contributing.md/)

BSD 3-Clause License

Copyright (c) 2019-2020, Charles Combes
Copyright (c) 2019-2020, Michał Urbanek base on work of Charles Combes and others in fastnfitness(https://github.com/brodeurlv/fastnfitness)
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down

0 comments on commit 6ff0b90

Please sign in to comment.