Skip to content

Commit 002efe6

Browse files
committed
Merge branch 'dev-maven' into reskin-or
# Conflicts: # src/main/java/com/cronos/onlinereview/util/ConfigHelper.java # src/main/resources/config.xml # web/jsp/viewProjectDetails.jsp
2 parents ea52f7e + 6c28367 commit 002efe6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.deploy/circleci/token.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ database.password=1nf0rm1x
1212
database.INFORMIXSERVER=informixoltp_tcp
1313
database.locale=en_us.utf8
1414

15-
# context.security.url - URL for JNDI lookup
15+
# context.security.url - URL for JNDI lookup
1616
context.security.url=localhost:11199
1717

1818
## Used by cache.properties

web/includes/project/project_info.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</c:if>
3737
<a class="breadcrumbLinks"
3838
href="${viewContestLink}"><or:text key="viewProjectDetails.ViewContest" /></a> |
39-
<a class="breadcrumbLinks"
39+
<a class="breadcrumbLinks projectInfo__forumLink"
4040
href="${forumLink}"><or:text key="viewProjectDetails.DevelopmentForum" /></a></td>
4141
</tr>
4242
</table>

0 commit comments

Comments
 (0)