Commit 003b865

committed

Merge branch 'master' of http://www.github.com/Vedaad-Shakib/oola

Conflicts: media/css/oola.css templates/classCheckin.html

2 parents bb22269 + 5f23e4d commit 003b865Copy full SHA for 003b865

1 file changed

+0

-63

lines changed

templates
- #myProfile.html#

1 file changed

+0

-63

lines changed

`‎templates/#myProfile.html#`

This file was deleted.

Comments

(0)