Closed sadlerw closed 9 years ago
Merge conflicts
I pointed it at develop but it is really branched off of the branch for pr #16
So if we merge #16 this should resolve the conflict and we can merge? I'd like to see #22 and #27 resolved this morning so we can really start testing these.
Should resolve conflicts.
the cake is a lie
The dress is gold and black.
The build failure looks legit. I'll look into it.
Went ahead and pushed my base64 thing here since it also needed the navbar change
:+1:
MERGE PR #16 FIRST!!
adds typeahead to the search box for epileptic pharma brands