CarlNation
|
4d96191915
|
Merge branch 'release/2022.09.29' into rlsmerge/2022.09.29-to-develop
|
2022-09-14 09:35:26 -04:00 |
|
Leah Schumann
|
4ccfa5e3f0
|
Remove text-block.orig file
|
2022-09-13 15:05:00 -04:00 |
|
Leah Schumann
|
bdc9f176b5
|
fixing error ... again?
|
2022-09-13 10:56:40 -04:00 |
|
Leah Schumann
|
02ff535f6e
|
fixed text-block build issues
|
2022-09-13 10:33:54 -04:00 |
|
Leah Schumann
|
c0da21419e
|
Added quote email message to estimate page and changed top / bottom margins to more accurately reflect Figma
|
2022-09-13 09:26:10 -04:00 |
|
Mark Harris
|
21d4b4884a
|
fixed remaining merge conflict
|
2022-09-13 09:25:51 -04:00 |
|
Leah Schumann
|
ceed64cc36
|
Preparing to merge 2022.09.29 branch into develop
|
2022-09-12 14:43:06 -04:00 |
|
Leah Schumann
|
681afdc4bd
|
Cherry-picked changes from commit 145359e226
|
2022-09-12 13:55:28 -04:00 |
|
Bryan Mauger
|
13d69d8d6a
|
CSR-725 add subheader copy, remove empty prop.
|
2022-08-31 08:47:59 -04:00 |
|
Bryan Mauger
|
74f519b3b1
|
Add v-html and correct typo.
|
2022-08-29 10:03:47 -04:00 |
|
Bryan Mauger
|
ce840d8177
|
CSR-735 create text-block component.
|
2022-08-29 09:41:13 -04:00 |
|