Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
Dirk Rombauts committed Oct 6, 2015
2 parents cbcc7ac + 9995226 commit a823258
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 8 deletions.
7 changes: 7 additions & 0 deletions DeployOutput.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@ECHO OFF

cd ..\picklesdoc.github.com
rmdir Output /s /q
echo D | xcopy ..\pickles\Output Output /e
powershell -Command "(gc index_template.md) -replace 'VERSION_PLACEHOLDER', '%1' | Out-File -encoding ASCII index.md"
cd ..\pickles
6 changes: 6 additions & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Pickles Release Notes

## v1.2.3 - 2015-10-06

### Bugs Fixed

- In the DHtml version, the alignment of the keywords (Given, When, Then) was fixed for non-English languages ([#219](https://github.com/picklesdoc/pickles/issues/219))

## v1.2.2 - 2015-09-24

### Bugs Fixed
Expand Down
2 changes: 1 addition & 1 deletion build.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@echo off
set "picklesVersion=1.2.2"
set "picklesVersion=1.2.3"
set "fakeVersion=3.36.0"

cls
Expand Down
4 changes: 0 additions & 4 deletions src/Pickles/Pickles.BaseDhtmlFiles/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ li.step {
.keyword {
font-weight: bold;
color: #0000FF;
float: left;
width: 40px;
text-align: right;
margin-right: 4px;
}

.steps table {
Expand Down
6 changes: 3 additions & 3 deletions src/Pickles/VersionInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
[assembly: AssemblyTrademarkAttribute("")]
[assembly: AssemblyCultureAttribute("")]
[assembly: ComVisibleAttribute(false)]
[assembly: AssemblyVersionAttribute("1.2.2")]
[assembly: AssemblyFileVersionAttribute("1.2.2")]
[assembly: AssemblyVersionAttribute("1.2.3")]
[assembly: AssemblyFileVersionAttribute("1.2.3")]
namespace System {
internal static class AssemblyVersionInformation {
internal const string Version = "1.2.2";
internal const string Version = "1.2.3";
}
}

0 comments on commit a823258

Please sign in to comment.