changes made by nive-version 1
Fix for bug #1234
Merge branch 'my_feature_branch' into dev
Dario's latest commit
Changes made #2
test commit
More changes from Dario
Had to revert something from dario's Changes
New widget On Today
test again
Backgound to the show page
Had to put it back in
Change to file
Merge branch 'localbranch' into dev
commited the changes made niveeeeeeee
this is my 3rd commit.
Merge branch 'my_feature_branch' into dev
Merge branch 'dev' of github.com:darrinkatz/workshop into dev
Merge branch 'my_feature_branch' into dev
another commit