spec/javascripts/app/views/poll_view_spec.js · 1959f0d93946d91f4f737e0632a47c39475ac78c · facil / parlote-facil · GitLab

oct. 03, 2014
1959f0d9
Merge branch 'hotfix/0.4.1.1' into develop · 1959f0d9
Jonne Haß a rédigé oct. 03, 2014
```
Conflicts:
	Changelog.md
	config/defaults.yml
```
1959f0d9
Merge branch 'hotfix/0.4.1.1' into develop
Jonne Haß a rédigé oct. 03, 2014
```
Conflicts:
	Changelog.md
	config/defaults.yml
```