diff options
author | Marie <ml.kochsiek@fu-berlin.de> | 2016-09-14 16:38:51 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-14 16:38:51 +0000 |
commit | d72c87cb94213c9a507596f2103773969d1cbd30 (patch) | |
tree | 7b13646448e64e560101493eeac1a03c3a25dbd8 /config/initializers/assets.rb | |
parent | 42459748e9e8e30a9cc0c64eaf4b8e10814d2dc2 (diff) | |
parent | 22478d315af3590d2a344eb1aa8cf2aec0730506 (diff) |
Merge pull request #14 from LoadToCode/develop
Taking it all from branch develop and push it to branch temp_1_marie
Diffstat (limited to 'config/initializers/assets.rb')
0 files changed, 0 insertions, 0 deletions