diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-01-24 14:27:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-24 14:27:13 +0100 |
| commit | 4f3264d2912d1b70a22099f1c713691f91ba890d (patch) | |
| tree | 8a48ce38d47351bc3739cebd3672d40c98763807 /app/models/block.rb | |
| parent | 4a146a0d189280dbd15098f42850ca550e0d7910 (diff) | |
| parent | 21c209636d12ea601379e7abd3d370ad0d22ea18 (diff) | |
Merge branch 'master' into boostspin
Diffstat (limited to 'app/models/block.rb')
0 files changed, 0 insertions, 0 deletions