Skip to content

Commit

Permalink
Merge branch 'release/v1.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Kamil Kisiela committed Nov 20, 2015
2 parents 08a04fc + 56414ca commit 6b361ee
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 7 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,3 @@ atlassian-ide-plugin.xml
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties

dist
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [1.2.1] - 2015-11-20
### Fixed
- npm package name
- bower package name

## [1.2.0] - 2015-11-20
### Added
- Support for npm
Expand Down Expand Up @@ -47,6 +52,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## 0.0.1 - 2015-11-09

[1.2.1]: https://github.com/wieldo/angular-formly-transformer/compare/v1.2.0...v1.2.1
[1.2.0]: https://github.com/wieldo/angular-formly-transformer/compare/v1.1.2...v1.2.0
[1.1.2]: https://github.com/wieldo/angular-formly-transformer/compare/v1.1.1...v1.1.2
[1.1.1]: https://github.com/wieldo/angular-formly-transformer/compare/v1.1.0...v1.1.1
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "formly-transformer",
"version": "1.2.0",
"name": "angular-formly-transformer",
"version": "1.2.1",
"description": "Automate configuration of fields in Angular-Formly",
"main": "dist/formly-transformer.js",
"authors": [
Expand Down
2 changes: 1 addition & 1 deletion package.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var client = 'client';
Package.describe({
name: "wieldo:angular-formly-transformer",
summary: "Automate configuration of fields in Angular-Formly",
version: "1.2.0",
version: "1.2.1",

documentation: 'README.md',
git: 'https://github.com/wieldo/angular-formly-transformer.git'
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "formly-transformer",
"version": "1.2.0",
"name": "angular-formly-transformer",
"version": "1.2.1",
"description": "Automate configuration of fields in Angular-Formly",
"main": "dist/angular-formly-transformer.js",
"authors": [
Expand Down

0 comments on commit 6b361ee

Please sign in to comment.