[ https://issues.apache.org/jira/browse/JOSHUA-332?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16320535#comment-16320535 ]
Lewis John McGibbney commented on JOSHUA-332: --------------------------------------------- If this is an entire PITA I would just leave it and close it as not an issue. > Merge 7 branch into master > --------------------------- > > Key: JOSHUA-332 > URL: https://issues.apache.org/jira/browse/JOSHUA-332 > Project: Joshua > Issue Type: Task > Components: core > Reporter: Tommaso Teofili > Assignee: Tommaso Teofili > Fix For: 7 > > > As discussed on the mailing list, let's branch _master_ into a _6x_ branch > and merge branch _7_ into _master_ in order to keep developing on top of the > latest in the main branch. -- This message was sent by Atlassian JIRA (v6.4.14#64029)