joindin/joindin-web2 — pull request #62 by clairs (2014-01-11 13:48:42+00:00)
Title: JOINDIN-315: Add Flickr machine tags functionality

This continues on from Tocacar's PR (https://github.com/joindin/joindin-web2/pull/26), and merges Master into the branch, fixing conflicts. No other changes have been made

When merging in, we'll need to create a flickr API and update the config on the server