bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

resolved conflicts [ci skip]

Browse Source
This commit is contained in:
Cesidio Di Landa 2013-06-12 11:13:40 +02:00
commit e7c6cb9133
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -4,6 +4,10 @@ Changelog
0.5.0 0.5.0
----- -----
0.4.1
-----
* Updated database_cleaner gem
0.4.0 0.4.0
----- -----
* Rails 4 rc2 * Rails 4 rc2

3
Gemfile.lock
View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
GIT GIT
remote: git://github.com/bmabey/database_cleaner.git remote: git://github.com/bmabey/database_cleaner.git
revision: 20136e8987c222013d96e07c27d1230d2bbebd61 revision: 20136e8987c222013d96e07c27d1230d2bbebd61
@ -5,6 +6,8 @@ GIT
specs: specs:
database_cleaner (0.9.1) database_cleaner (0.9.1)
=======
>>>>>>> hotfix/0.4.1
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs: