Merge branch 'master', remote-tracking branch 'origin/master'
Merge branches 'dev' and 'master'
Merge branches 'master' and 'dev'
Fixes bug in new team creation
Fixes the empty calendar bug on the public pages
Fixing...
Merge branch 'dev', remote-tracking branch 'origin/dev' into dev
Merge branch 'master', remote-tracking branch 'origin/master' into dev
fixes conflicts
Deleted a phrase