Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
spring-cloud-netflix
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
spring-cloud-netflix
Commits
ff5bf153
Unverified
Commit
ff5bf153
authored
Nov 28, 2017
by
Spencer Gibb
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '1.4.x'
# Conflicts: # docs/pom.xml
parents
1cf1f435
dde7ff4c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
pom.xml
docs/pom.xml
+1
-1
No files found.
docs/pom.xml
View file @
ff5bf153
...
...
@@ -14,7 +14,7 @@
<properties>
<docs.main>
spring-cloud-netflix
</docs.main>
<main.basedir>
${basedir}/..
</main.basedir>
<docs.whitelisted.branches>
1.
0.x,1.1.x,1.2.x,1.3.x,2.0
.x
</docs.whitelisted.branches>
<docs.whitelisted.branches>
1.
2.x,1.3.x,1.4
.x
</docs.whitelisted.branches>
</properties>
<build>
<plugins>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment