mirror of
				https://github.com/crater-invoice/crater.git
				synced 2025-10-30 21:21:09 -04:00 
			
		
		
		
	fix conflicts and issue with add_number_length migration
This commit is contained in:
		
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| @ -22,33 +22,6 @@ | ||||
|     * @license MIT | ||||
|     */ | ||||
|  | ||||
| /*! | ||||
|  * | ||||
|  * Copyright 2009-2017 Kris Kowal under the terms of the MIT | ||||
|  * license found at https://github.com/kriskowal/q/blob/v1/LICENSE | ||||
|  * | ||||
|  * With parts by Tyler Close | ||||
|  * Copyright 2007-2009 Tyler Close under the terms of the MIT X license found | ||||
|  * at http://www.opensource.org/licenses/mit-license.html | ||||
|  * Forked at ref_send.js version: 2009-05-11 | ||||
|  * | ||||
|  * With parts by Mark Miller | ||||
|  * Copyright (C) 2011 Google Inc. | ||||
|  * | ||||
|  * Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|  * you may not use this file except in compliance with the License. | ||||
|  * You may obtain a copy of the License at | ||||
|  * | ||||
|  * http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  * | ||||
|  * Unless required by applicable law or agreed to in writing, software | ||||
|  * distributed under the License is distributed on an "AS IS" BASIS, | ||||
|  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|  * See the License for the specific language governing permissions and | ||||
|  * limitations under the License. | ||||
|  * | ||||
|  */ | ||||
|  | ||||
| /*! | ||||
|  * Chart.js v2.9.4 | ||||
|  * https://www.chartjs.org | ||||
| @ -56,37 +29,12 @@ | ||||
|  * Released under the MIT License | ||||
|  */ | ||||
|  | ||||
| /*! | ||||
|  * Sizzle CSS Selector Engine v2.3.5 | ||||
|  * https://sizzlejs.com/ | ||||
|  * | ||||
|  * Copyright JS Foundation and other contributors | ||||
|  * Released under the MIT license | ||||
|  * https://js.foundation/ | ||||
|  * | ||||
|  * Date: 2020-03-14 | ||||
|  */ | ||||
|  | ||||
| /*! | ||||
|  * Vue.js v2.6.12 | ||||
|  * (c) 2014-2020 Evan You | ||||
|  * Released under the MIT License. | ||||
|  */ | ||||
|  | ||||
| /*! | ||||
|  * jQuery JavaScript Library v3.5.1 | ||||
|  * https://jquery.com/ | ||||
|  * | ||||
|  * Includes Sizzle.js | ||||
|  * https://sizzlejs.com/ | ||||
|  * | ||||
|  * Copyright JS Foundation and other contributors | ||||
|  * Released under the MIT license | ||||
|  * https://jquery.org/license | ||||
|  * | ||||
|  * Date: 2020-05-04T22:49Z | ||||
|  */ | ||||
|  | ||||
| /*! | ||||
|  * vue2-transitions v0.3.0 | ||||
|  * (c) 2019-present cristij <joracristi@gmail.com> | ||||
|  | ||||
		Reference in New Issue
	
	Block a user