Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop-1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sue445 committed Jan 26, 2017
2 parents d6140c1 + a6061f8 commit fb56497
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Expand Up @@ -6,7 +6,9 @@ rvm:
- ruby-head
bundler_args: "--jobs=2"
cache: bundler
before_install: gem install bundler -v 1.11.2
before_install:
- gem update --system --no-document
- gem install bundler -v 1.11.2
before_script:
- export CODECLIMATE_REPO_TOKEN=8e9db6ee5f3818e87287a6393086c2ccb9b1b83106c5bfb972211abefd2fe162
- export CI=true
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
@@ -1,5 +1,5 @@
## master
[full changelog](http://github.com/sue445/rubicure/compare/v0.4.12...master)
[full changelog](http://github.com/sue445/rubicure/compare/v0.4.13...master)

## v1.0.0

Expand All @@ -24,6 +24,12 @@
* https://github.com/sue445/rubicure/pull/138
* https://github.com/sue445/rubicure/issues/136

## v0.4.13
[full changelog](http://github.com/sue445/rubicure/compare/v0.4.12...v0.4.13)

* Add ended_date of Mahogirls precure
* https://github.com/sue445/rubicure/pull/139

## v0.4.12
[full changelog](http://github.com/sue445/rubicure/compare/v0.4.11...v0.4.12)

Expand Down
2 changes: 1 addition & 1 deletion config/series.yml
Expand Up @@ -163,7 +163,7 @@ maho_girls: &maho_girls
series_name: maho_girls
title: 魔法つかいプリキュア!
started_date: 2016-02-07
# ended_date: 2017-01-
ended_date: 2017-01-29
girls:
- cure_miracle
- cure_magical
Expand Down

0 comments on commit fb56497

Please sign in to comment.