gemfile
solution for conflict
Merge branch 'develop' of https://github.com/hermanos/audioguide into design
strange error
Merge branch 'develop' of https://github.com/hermanos/audioguide into design
Merge branch 'develop' of https://github.com/hermanos/audioguide into design
Update Master v.2 (merge Develop)
No important
Add model -> spec
Merge branch 'master' of github.com:hermanos/audioguide
Fix Pixies after Stash from Master
Resolve some bugs
Update from Develop
Unstash :-)
Add profile update
Update Dev again...
Add profile role selection
Update Dev v.3
fix deployment
fix unicorn