merge conflict resolved in events show.html.erb
merge conflict resolved in events show.html.erb
Updated Readme
Toan | Added Just Giving Event Id to Events model
Merge branch 'development' of https://github.com/yoshdog/challenge-me into development
Merge branch 'master' of github.com:yoshdog/challenge-me into development
Jamie & Nicola | Event controller refactoring
Merge branch 'development' of github.com:yoshdog/challenge-me into development
Merge branch 'development' of github.com:yoshdog/challenge-me into development
Toan | Feature Added: Donation amounts are live updated from just giving
Feature Added: Users can now donate to the relavent JG event
Joe | Add pledge modal to events page
Jamie | Profile page layout & stlying updated
Merge branch 'development' of github.com:yoshdog/challenge-me into development
Joe | Fixed tests removed }
Jamie | Events page - days complete box styling
Merge branch 'development' of github.com:yoshdog/challenge-me into development
Nicola | fixed timecop error with %
Jamie | 3 events page errors solved
Merge branch 'development' of github.com:yoshdog/challenge-me into development