Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into v0.3.0

Browse Source 
Conflicts:
	VERSION
	docs/.buildinfo
	docs/_static/documentation_options.js
	docs/api/activities.html
	docs/api/auth.html
	docs/api/index.html
	docs/api/records.html
	docs/api/sports.html
	docs/api/stats.html
	docs/api/users.html
	docs/changelog.html
	docs/features.html
	docs/genindex.html
	docs/http-routingtable.html
	docs/index.html
	docs/installation.html
	docs/objects.inv
	docs/search.html
	docs/searchindex.js
	docs/troubleshooting/administrator.html
	docs/troubleshooting/index.html
	docs/troubleshooting/user.html
	fittrackee_api/poetry.lock
	fittrackee_client/src/utils/index.js
	yarn.lock
This commit is contained in:
Sam
2020-01-30 22:45:50 +01:00
parent 99ee0e4200 694248ecac
commit 8c711a2e83
45 changed files with 1850 additions and 1099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fittrackee_client/src/components/User/ProfileEdit.jsx
View File

@ -205,7 +205,7 @@ class ProfileEdit extends React.Component {
<label>
{t('user:Timezone')}:
<TimezonePicker
className="form-control timezone-custom-height"
className="form-control timezone-custom"
onChange={tz => {
const e = {
target: {