diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2017-02-22 20:32:41 +0300 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2017-02-22 20:32:41 +0300 |
| commit | 931db7963ee9fa145d8fe2fb5eea209215227db7 (patch) | |
| tree | a85ddfcf479ea09237c54a6ce9b0557925f583ff /.ruby-version | |
| parent | 0b402e11e355dc8d834fbc139f4bca810a9f766e (diff) | |
| parent | 33e4294fc884c7bd2a7fb86baf4731daf87db7bb (diff) | |
Merge branch 'master' into 'api-notes-entity-fields'
# Conflicts:
# doc/api/v3_to_v4.md
Diffstat (limited to '.ruby-version')
0 files changed, 0 insertions, 0 deletions