BTW: Sorry for forgetting to merge Falcon as well and thanks Alex for taking care of it.
> On Jul 3, 2017, at 4:41 PM, Harbs <harbs.li...@gmail.com> wrote: > > I just merged the TLF branch back into develop. > > TLF is still “alpha quality”, so unless you do a LOT of custom work on a > proprietary text engine, it’s not going to be very useful. However, it’s > already useful to me, so it might be useful to someone else. > > I might keep the TLF branch live in case I make any major changes there, but > I’m not sure yet. Either way, most of my commits will be going into develop > at this point. > > Speaking of branches: > I’m not sure what we decided vis a vis feature branches. I think we were > supposed to be focusing on development on feature branches and merging those > in when a feature is complete. Is that right? > > Harbs
