허진호 / cloud_computing_fileshell

Go to a project
Toggle navigation Toggle navigation pinning
허진호
aa2ca95c 1 parent 4f4e3dd8

Merge branch 'dev' of https://github.com/jh8579/fileshell_cloudcomputing into dev 

# Conflicts:
#	fileshell/models.py
#	fileshell/settings.py
#	fileshell/urls.py
#	fileshell/views.py
#	templates/base.html
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
......@@ -109,12 +109,12 @@ body {
.frame_home {
float:left;
width:80%;
width:70%;
}
.frame {
float:left;
width: 60%;
width: 50%;
}
.container {
......