diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-10 15:34:55 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-10 15:34:55 -0300 |
| commit | 085ce4f1411238a6109fb9c22fdb2c46b27c2c0e (patch) | |
| tree | e57262b3e867ee6fef40e63e09619fffde075d8e /activerecord/test/models/record.rb | |
| parent | 54d8c81fefdb566c2f317afd0142cade0273bdbc (diff) | |
| parent | 53610e5140149aca3a15a27ef103350a5969f7aa (diff) | |
| download | rails-085ce4f1411238a6109fb9c22fdb2c46b27c2c0e.tar.gz rails-085ce4f1411238a6109fb9c22fdb2c46b27c2c0e.tar.bz2 rails-085ce4f1411238a6109fb9c22fdb2c46b27c2c0e.zip | |
Merge branch 'master' into rm-uuid-fixtures
Conflicts:
activerecord/CHANGELOG.md
activesupport/CHANGELOG.md
Diffstat (limited to 'activerecord/test/models/record.rb')
| -rw-r--r-- | activerecord/test/models/record.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/test/models/record.rb b/activerecord/test/models/record.rb new file mode 100644 index 0000000000..f77ac9fc03 --- /dev/null +++ b/activerecord/test/models/record.rb @@ -0,0 +1,2 @@ +class Record < ActiveRecord::Base +end |