ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2025-01-21 02:01:56 +01:00
Code Issues Releases Wiki Activity
ab1cab2091
onion/js
History
Tim Daubenschütz ab1cab2091 Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra 
Clear some merge conflicts and also some wrong merges.

BAD GIT!!!

Conflicts:
	js/components/ascribe_forms/property.js
	js/components/ascribe_uploader/react_s3_fine_uploader_utils.js
	sass/ascribe_uploader.scss
2015-09-15 13:30:24 +02:00
..
actions contract list make public 2015-09-09 11:11:16 +02:00
components Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra 2015-09-15 13:30:24 +02:00
constants Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra 2015-09-15 13:30:24 +02:00
fetchers contract list make public 2015-09-09 11:11:16 +02:00
mixins
models
stores terms and conditions page with accept/deny 2015-09-07 12:03:59 +02:00
third_party Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra 2015-09-15 13:30:24 +02:00
utils only one agreement pending 2015-09-09 19:29:58 +02:00
alt.js
app.js Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra 2015-09-15 13:30:24 +02:00
routes.js contract agreement notifications 2015-09-04 11:49:55 +02:00