From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Mon, 7 Jan 2013 23:25:02 +0000 (+0100)
Subject: Merge branch 'drzb2013v2' of mjesec.ffzg.hr:/git/angular-drzb into drzb2013v2
X-Git-Tag: 0.4~52
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=56dba44bb22e334a4c7b22e2ef491372ce9fd9de;p=angular-drzb

Merge branch 'drzb2013v2' of mjesec.ffzg.hr:/git/angular-drzb into drzb2013v2
---

56dba44bb22e334a4c7b22e2ef491372ce9fd9de
diff --cc app/index.html
index c81b828,b24bf86..4fa2ef1
--- a/app/index.html
+++ b/app/index.html
@@@ -5,11 -5,10 +5,11 @@@
    <title>DRZB conference</title>
  
    <!-- Twtitter bootstrap -->
-   <link rel="stylesheet" href="bootstrap/css/bootstrap.min.css" />
-   <link rel="stylesheet" href="bootstrap/css/bootstrap-responsive.min.css" />
+   <link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css" />
+   <link rel="stylesheet" href="lib/bootstrap/css/bootstrap-responsive.min.css" />
  
    <link rel="stylesheet" href="css/app.css"/>
 +  <link rel="stylesheet" href="css/drzb2013.css"/>
  
      <!--[if lte IE 8]>
        <script>