Merge branch 'master' into dev
This commit is contained in:
		@@ -16,7 +16,7 @@
 | 
				
			|||||||
---
 | 
					---
 | 
				
			||||||
 | 
					
 | 
				
			||||||
This web application allows you to track your outdoor activities (workouts) from gpx files and keep your data on your own server.  
 | 
					This web application allows you to track your outdoor activities (workouts) from gpx files and keep your data on your own server.  
 | 
				
			||||||
No mobile app is developed yet, but several existing mobile apps can store workouts data locally and export them into a gpx file.  
 | 
					No mobile app has been developed yet, but several existing mobile apps can store workouts data locally and export them into a gpx file.  
 | 
				
			||||||
Examples for Android (non-exhaustive list):  
 | 
					Examples for Android (non-exhaustive list):  
 | 
				
			||||||
* [Runner Up](https://github.com/jonasoreland/runnerup) (GPL v3)  
 | 
					* [Runner Up](https://github.com/jonasoreland/runnerup) (GPL v3)  
 | 
				
			||||||
* [ForRunners](https://gitlab.com/brvier/ForRunners) (GPL v3)  
 | 
					* [ForRunners](https://gitlab.com/brvier/ForRunners) (GPL v3)  
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,7 @@ FitTrackee
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
| This web application allows you to track your outdoor activities (workouts)
 | 
					| This web application allows you to track your outdoor activities (workouts)
 | 
				
			||||||
  from gpx files and keep your data on your own server.
 | 
					  from gpx files and keep your data on your own server.
 | 
				
			||||||
| No mobile app is developed yet, but several existing mobile apps can
 | 
					| No mobile app has been developed yet, but several existing mobile apps can
 | 
				
			||||||
  store workouts data locally and export them into a gpx file.
 | 
					  store workouts data locally and export them into a gpx file.
 | 
				
			||||||
| Examples for Android (non-exhaustive list):
 | 
					| Examples for Android (non-exhaustive list):
 | 
				
			||||||
| \* `Runner Up <https://github.com/jonasoreland/runnerup>`_ (GPL v3)
 | 
					| \* `Runner Up <https://github.com/jonasoreland/runnerup>`_ (GPL v3)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -128,7 +128,7 @@
 | 
				
			|||||||
<div class="line-block">
 | 
					<div class="line-block">
 | 
				
			||||||
<div class="line">This web application allows you to track your outdoor activities (workouts)
 | 
					<div class="line">This web application allows you to track your outdoor activities (workouts)
 | 
				
			||||||
from gpx files and keep your data on your own server.</div>
 | 
					from gpx files and keep your data on your own server.</div>
 | 
				
			||||||
<div class="line">No mobile app is developed yet, but several existing mobile apps can
 | 
					<div class="line">No mobile app has been developed yet, but several existing mobile apps can
 | 
				
			||||||
store workouts data locally and export them into a gpx file.</div>
 | 
					store workouts data locally and export them into a gpx file.</div>
 | 
				
			||||||
<div class="line">Examples for Android (non-exhaustive list):</div>
 | 
					<div class="line">Examples for Android (non-exhaustive list):</div>
 | 
				
			||||||
<div class="line">* <a class="reference external" href="https://github.com/jonasoreland/runnerup">Runner Up</a> (GPL v3)</div>
 | 
					<div class="line">* <a class="reference external" href="https://github.com/jonasoreland/runnerup">Runner Up</a> (GPL v3)</div>
 | 
				
			||||||
 
 | 
				
			|||||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							@@ -7,7 +7,7 @@ FitTrackee
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
| This web application allows you to track your outdoor activities (workouts)
 | 
					| This web application allows you to track your outdoor activities (workouts)
 | 
				
			||||||
  from gpx files and keep your data on your own server.
 | 
					  from gpx files and keep your data on your own server.
 | 
				
			||||||
| No mobile app is developed yet, but several existing mobile apps can
 | 
					| No mobile app has been developed yet, but several existing mobile apps can
 | 
				
			||||||
  store workouts data locally and export them into a gpx file.
 | 
					  store workouts data locally and export them into a gpx file.
 | 
				
			||||||
| Examples for Android (non-exhaustive list):
 | 
					| Examples for Android (non-exhaustive list):
 | 
				
			||||||
| \* `Runner Up <https://github.com/jonasoreland/runnerup>`_ (GPL v3)
 | 
					| \* `Runner Up <https://github.com/jonasoreland/runnerup>`_ (GPL v3)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user