[
https://issues.apache.org/jira/browse/MARMOTTA-356?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13818826#comment-13818826
]
ASF subversion and git services commented on MARMOTTA-356:
----------------------------------------------------------
Commit c0620f7f8cf15da5d8430d059c593b0a897997bf in branch refs/heads/develop
from [~wikier]
[ https://git-wip-us.apache.org/repos/asf?p=incubator-marmotta.git;h=c0620f7 ]
MARMOTTA-356: fixed wrong conflict resolution
> Deploy HTML templates in the home folder
> ----------------------------------------
>
> Key: MARMOTTA-356
> URL: https://issues.apache.org/jira/browse/MARMOTTA-356
> Project: Marmotta
> Issue Type: New Feature
> Components: Admin Interface
> Affects Versions: 3.1-incubating
> Reporter: Sergio Fernández
> Assignee: Sergio Fernández
> Fix For: 3.2
>
> Original Estimate: 1h
> Remaining Estimate: 1h
>
> In the dead branch MARMOTTA-228 we implemented a quite feature: copying the
> templates to the home folder, allowing then users to customize then if
> required.
> With the wrong branching management there we end-up without such feature, so
> we might need to pick few commits from there:
> https://git-wip-us.apache.org/repos/asf?p=incubator-marmotta.git;a=commit;h=39deea295e5833f0c35b1de8dbdf490fc8d6bf08
> https://git-wip-us.apache.org/repos/asf?p=incubator-marmotta.git;a=commit;h=1aacc6416afd988f5d3e0f563dbad46b75c27eec
> https://git-wip-us.apache.org/repos/asf?p=incubator-marmotta.git;a=commit;h=1aacc6416afd988f5d3e0f563dbad46b75c27eec
--
This message was sent by Atlassian JIRA
(v6.1#6144)
