ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 17:33:14 +01:00
Code Issues Releases Wiki Activity
da73d40fd6
onion/js/components/ascribe_settings
History
Tim Daubenschütz da73d40fd6 Merge branch 'master' into AD-1264-refactor-reacts3fineuploader-to- 
Cleared all conflicts

Conflicts:
	js/components/ascribe_forms/form.js
	js/components/ascribe_forms/input_fineuploader.js
	js/components/ascribe_uploader/react_s3_fine_uploader.js
	js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
	js/utils/requests.js
2015-11-16 15:27:00 +01:00
..
account_settings.js Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-21 09:47:14 +02:00
api_settings.js replaced fonts 2015-10-12 15:25:21 +02:00
bitcoin_wallet_settings.js replaced fonts 2015-10-12 15:25:21 +02:00
contract_settings_update_button.js Merge branch 'master' into AD-1264-refactor-reacts3fineuploader-to- 2015-11-16 15:27:00 +01:00
contract_settings.js Add document title management for the ascribe app 2015-10-13 16:42:40 +02:00
settings_container.js Add document title management for the ascribe app 2015-10-13 16:42:40 +02:00