Conflict Resolved
Conflict Resolved
Hostname changed
Resolved Conflicts
conflict resolved
jquery aucomplete/pop-over/tag-input field added/modified
Merge branch 'development' of github.com:bashantad/Industry-project into development
Conflict Resolved
migration for taggable
jquery-ui added locallay
deleted resource_tag migration
added a migration for unique tag name
implemented flashMessage, admin section..
conflict resolved