diff options
author | Eugen <eugen@zeonfederated.com> | 2017-04-13 16:00:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-13 16:00:20 +0200 |
commit | 1a5a54eb4b93fd16d9a0d158919b1936abe39227 (patch) | |
tree | 79c9576e9f164eddb8cce9e585b2e4514ae44d1c /spec/controllers/settings | |
parent | d2c20936f35f140ea4d8600cfac1d452c33acdd2 (diff) | |
parent | 447b8bc44eb33ae6ffdfbcc7ae52fbe0bba93ece (diff) |
Merge branch 'master' into master
Diffstat (limited to 'spec/controllers/settings')
0 files changed, 0 insertions, 0 deletions