diff options
| author | Kai Schaper <303@posteo.de> | 2016-10-20 17:35:05 +0200 |
|---|---|---|
| committer | Kai Schaper <303@posteo.de> | 2016-10-20 17:35:05 +0200 |
| commit | 4b0e3eb1fbc462ee873ad5a996cca25e361ec9fa (patch) | |
| tree | 557bea513320b8d6970604c75aab4cac58c7ea85 /app/models/block.rb | |
| parent | 19cfe64455d805e7c21a4176256cc3e72d062d0b (diff) | |
| parent | 04bbc576906ff70feed7d42fef0e6db17fdd9ed3 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'app/models/block.rb')
0 files changed, 0 insertions, 0 deletions