overflow on show properties
fixing conflicts
fix merge conflict
fixing the bio column
merge conflict clean
ready for pull
Merge branch 'development' of github.com:jeantroiani/get_a_room into development
Merge branch 'development' of github.com:jeantroiani/get_a_room into development
before merge
ajax for reviews