Merge branch 'MDL-59645-master-flickr' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Sep 2017 17:29:40 +0000 (19:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Sep 2017 17:29:40 +0000 (19:29 +0200)
commit536572cf0b6b674d64345ca687d80937319d4855
tree504202f400ef5bd7cae5e7ec75acc553cabf4188
parent6d7953f2fe0de418da960f6925dbf9939c8a7bdb
parent05e77ab8f03e61bea02d0d824b16c665099d82e3
Merge branch 'MDL-59645-master-flickr' of git://github.com/mudrd8mz/moodle