FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

Conflicts:
	app/views/public/index.html.haml
	app/views/static/index.html.haml
This commit is contained in:
nilsding 2014-12-12 17:50:38 +01:00
parent 72ed9c3b3d a0f883f062
commit e50bd47741
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/public/index.html.haml
View File

@ -39,7 +39,7 @@
%ul.nav.nav-pills.nav-stacked
= nav_entry "Timeline", root_path
= nav_entry "Public", public_timeline_path
.visible-xs= render 'shared/links'
.hidden-xs= render 'shared/links'
.col-md-9.col-xs-12.col-sm-9
= render 'layouts/messages'

2
app/views/static/index.html.haml
View File

@ -40,7 +40,7 @@
%ul.nav.nav-pills.nav-stacked
= nav_entry "Timeline", root_path
= nav_entry "Public", public_timeline_path
.visible-xs= render 'shared/links'
.hidden-xs= render 'shared/links'
.col-md-9.col-xs-12.col-sm-9
= render 'layouts/messages'