Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 00:11:35 +02:00
Code Issues Releases Activity

Merging conflicts

Browse Source
This commit is contained in:
Hillel Coren 2014-03-18 15:20:38 +02:00
parent 45d38e8266
commit cf6e199bbe
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/about_us.blade.php
View File

@ -38,11 +38,7 @@
<div class="navbar" style="margin-bottom:0px"> <div class="navbar" style="margin-bottom:0px">
<div class="container"> <div class="container">
<div class="navbar-inner"> <div class="navbar-inner">
<<<<<<< HEAD
<a class="brand" href="#"><img src=
=======
<a class="brand" href="/"><img src= <a class="brand" href="/"><img src=
>>>>>>> upstream/master
"images/invoiceninja-logo.png"></a> "images/invoiceninja-logo.png"></a>
<ul class="navbar-list"> <ul class="navbar-list">
<li>{{ link_to('about', 'About Us' ) }}</li> <li>{{ link_to('about', 'About Us' ) }}</li>

BIN
public/images/hero-bg-4.psd
View File

Binary file not shown.