CatalystOfNostalgia / feckless-weasel

43%

master: 64%

LAST BUILD ON BRANCH filetable

branch: filetable

CHANGE BRANCH

x

Reset

• filetable
• 17_file_uploader
• 47_populatedb
• IntUIDs
• SQLFunctionality
• add_more_tests
• content_ranking
• coursePageViewing
• create_pages
• feature/disable_servlet_coverage
• getAllNotes4User
• issue_59
• master
• new_search
• pageFunctionality
• pretty
• pretty_university_create
• sidebars
• tags
• user/elliot/coursedepttesting
• user/elliot/dbtables
• user/elliot/rating_and_comments
• user/elliot/ratins
• user/elliot/testing
• user/flinn/department-tests
• user/flinn/editor
• user/flinn/file_download
• user/flinn/file_saving
• user/flinn/markdown_sharing
• user/flinn/markdown_update
• user/flinn/more_tests
• user/flinn/om-testing
• user/flinn/testing
• user/flinn/tests
• user/flinn/uni_list
• user/gundermanc/65_functional_profile_page
• user/gundermanc/file_viewing_page
• user/gundermanc/kill_the_rest
• user/gundermanc/news_feed
• user/gundermanc/object_model_tests
• user/gundermanc/om_coverage
• user/gundermanc/oss_win_readme_update
• user/gundermanc/pretty_change_password
• user/gundermanc/profile_page
• user/gundermanc/remove_user_names
• user/gundermanc/site_logo
• user/gundermanc/university_refactor
• user/gundermanc/user_auth_tests
• user/gundermanc/user_auth_wiring
• user/gundermanc/user_datatier_coverage_suppl
• user/gundermanc/user_om_coverage_suppl
• user/gundermanc/user_session_coverage
• user/hschmack/116_finishCoursePage
• user/hschmack/favorites
• user/hschmack/testRatings
• user/hschmack/testingBranch

Missed some merge conflicts