Skip to content
Snippets Groups Projects
Commit 4d9bd46c authored by Marcel Žec's avatar Marcel Žec
Browse files

Merge branch 'master' of gitlab.fel.cvut.cz:zecmarce/nss_part-time_job_portal_implementacia 

 Conflicts:
	Part-time_job_portal/src/main/java/cz/cvut/fel/nss/parttimejobportal/seeder/DatabaseSeeder.java
parents de4814d3 13f72ee7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment