Skip to content

Commit

Permalink
Merge pull request #8 from igemsoftware/branch1
Browse files Browse the repository at this point in the history
10/21/14
  • Loading branch information
bargho committed Oct 22, 2014
2 parents e3ebbb4 + 331313d commit fe969b0
Show file tree
Hide file tree
Showing 11 changed files with 1 addition and 1 deletion.
Binary file modified ProtoDB/ProtoDB/__pycache__/__init__.cpython-34.pyc
Binary file not shown.
Binary file modified ProtoDB/ProtoDB/__pycache__/settings.cpython-34.pyc
Binary file not shown.
Binary file modified ProtoDB/ProtoDB/__pycache__/urls.cpython-34.pyc
Binary file not shown.
Binary file modified ProtoDB/ProtoDB/__pycache__/wsgi.cpython-34.pyc
Binary file not shown.
Binary file modified ProtoDB/databasemodels/__pycache__/__init__.cpython-34.pyc
Binary file not shown.
Binary file modified ProtoDB/databasemodels/__pycache__/admin.cpython-34.pyc
Binary file not shown.
Binary file modified ProtoDB/databasemodels/__pycache__/forms.cpython-34.pyc
Binary file not shown.
Binary file modified ProtoDB/databasemodels/__pycache__/models.cpython-34.pyc
Binary file not shown.
Binary file modified ProtoDB/databasemodels/__pycache__/views.cpython-34.pyc
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ProtoDB/templates/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h1> ProtoCat </h1>



<img src="img/blue_test_tubes.jpg">
<img src="{% static "databasemodels/img/blue_test_tubes.jpg" %}">


</div>
Expand Down

0 comments on commit fe969b0

Please sign in to comment.