Nicolas Lœuillet 38b418b7d6 resolve conflicts

2013-08-23 23:18:36 +02:00

..

css

Revert "Add SHAARLI support to view template"

2013-08-23 23:09:43 +02:00

img

Revert "Add SHAARLI support to view template"

2013-08-23 23:09:43 +02:00

js

Revert "Add SHAARLI support to view template"

2013-08-23 23:09:43 +02:00

_bookmarklet.twig

Revert "Add SHAARLI support to view template"

2013-08-23 23:09:43 +02:00

_footer.twig

Revert "Add SHAARLI support to view template"

2013-08-23 23:09:43 +02:00

_head.twig

Revert "Add SHAARLI support to view template"

2013-08-23 23:09:43 +02:00

_menu.twig

Revert "Add SHAARLI support to view template"

2013-08-23 23:09:43 +02:00

_messages.twig

Revert "Add SHAARLI support to view template"

2013-08-23 23:09:43 +02:00

_top.twig

Revert "Add SHAARLI support to view template"

2013-08-23 23:09:43 +02:00

config.twig

resolve conflicts

2013-08-23 23:18:36 +02:00

error.twig

Revert "Add SHAARLI support to view template"

2013-08-23 23:09:43 +02:00

export.twig

Revert "Add SHAARLI support to view template"

2013-08-23 23:09:43 +02:00

home.twig

Revert "Add SHAARLI support to view template"

2013-08-23 23:09:43 +02:00

install.twig

Revert "Add SHAARLI support to view template"

2013-08-23 23:09:43 +02:00

layout.twig

resolve conflicts

2013-08-23 23:18:36 +02:00

login.twig

Revert "Add SHAARLI support to view template"

2013-08-23 23:09:43 +02:00

view.twig

Add SHAARLI support to view template

2013-08-23 23:11:34 +02:00