diminator bd52bc8136 Merge remote-tracking branch 'remotes/origin/AD-699-rename-prize-endpoint-to-prizes' into AD-686-in-sluice-art-prize-i-can-submit- ... Conflicts: .gitignore js/components/whitelabel/prize/constants/api_urls.js		2015-08-05 14:50:17 +02:00
..
api_urls.js	Merge remote-tracking branch 'remotes/origin/AD-699-rename-prize-endpoint-to-prizes' into AD-686-in-sluice-art-prize-i-can-submit-	2015-08-05 14:50:17 +02:00
application_prize_constants.js	rename prize endpoint to prizes	2015-07-31 13:44:57 +02:00