diff options
| author | Jonne Haß <me@jhass.eu> | 2014-10-30 23:36:46 +0300 |
|---|---|---|
| committer | Jonne Haß <me@jhass.eu> | 2014-10-30 23:36:46 +0300 |
| commit | aab1e4b5b19a529f22a96aa05b406cea23f8f68e (patch) | |
| tree | d5a0d118b979f6c67a01be625a763eb285287706 /app | |
| parent | 62f1015d7782bbcc7b71def172a7bed726d9740f (diff) | |
| parent | 7000f39881fd0c2eba5f44904fdc575fcbd42480 (diff) | |
Merge branch 'hotfix/0.4.1.2' into develop
Conflicts:
Changelog.md
Gemfile
Gemfile.lock
config/defaults.yml
Diffstat (limited to 'app')
0 files changed, 0 insertions, 0 deletions