ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 09:35:10 +01:00
Code Issues Releases Wiki Activity
1,451 Commits 115 Branches 0 Tags 13 MiB
7283ae7574
Commit Graph

5 Commits

Author SHA1 Message Date
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
Tim Daubenschütz
8e98a7bff7 show overall progress 2015-09-04 14:54:39 +02:00
diminator
9b7a69bc20 contract agreement notifications 2015-09-04 11:49:55 +02:00
vrde
17ec6f34e0 Fix code after review 2015-07-27 18:21:20 +02:00
vrde
4d93e076df Add third party modules to handle tracking without polluting the code 2015-07-27 18:06:02 +02:00