diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2016-04-29 16:00:15 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2016-04-29 16:00:15 +0000 |
| commit | 9d1bf059c0a570f68b2394bfb383434a6b0d0a49 (patch) | |
| tree | 67b2ede3e22eda2eac05ccaf6fa0db4164662bbe /activerecord/lib/active_record/locking/optimistic.rb | |
| parent | 4a446220a67e115c04a2b562dce92981a8e18c78 (diff) | |
| parent | 0f91e2bc2591340369c7644678eab6c1d93043c1 (diff) | |
| download | rails-9d1bf059c0a570f68b2394bfb383434a6b0d0a49.tar.gz rails-9d1bf059c0a570f68b2394bfb383434a6b0d0a49.tar.bz2 rails-9d1bf059c0a570f68b2394bfb383434a6b0d0a49.zip | |
Merge branch 'master' of github.com:rails/docrails
Conflicts:
guides/source/configuring.md
Diffstat (limited to 'activerecord/lib/active_record/locking/optimistic.rb')
0 files changed, 0 insertions, 0 deletions