Christian Rinderknecht
|
81868ca3b2
|
Merge branch 'rinderknecht-dev' of gitlab.com:ligolang/ligo into rinderknecht-dev
|
2019-09-27 14:36:59 +02:00 |
|
Christian Rinderknecht
|
814a37b477
|
Merge remote-tracking branch 'origin/dev' into rinderknecht-dev
|
2019-09-27 14:35:47 +02:00 |
|
Christian Rinderknecht
|
e5e9fb8e2f
|
Merge branch 'dev' into 'rinderknecht-dev'
# Conflicts:
# src/passes/1-parser/pascaligo/AST.ml
# src/passes/1-parser/pascaligo/AST.mli
# src/passes/1-parser/pascaligo/ParToken.mly
|
2019-09-27 11:47:59 +00:00 |
|
Gabriel Alfour
|
ebf699cde7
|
Merge branch 'feature/failwith-typed' into 'dev'
Feature/failwith typed
See merge request ligolang/ligo!98
|
2019-09-26 20:25:46 +00:00 |
|
Tom Jack
|
6fc1b6430b
|
Add a little bit of tez tests, fix cameligo lexer bug
|
2019-09-26 13:31:37 -05:00 |
|
galfour
|
7974469159
|
remove fail
|
2019-09-26 19:30:17 +02:00 |
|
Christian Rinderknecht
|
68ff421b7d
|
Merge remote-tracking branch 'origin/dev' into rinderknecht-dev
|
2019-09-26 17:11:08 +02:00 |
|
galfour
|
9a7c3ee54d
|
Merge branch 'dev' into refactor/everything
|
2019-09-20 17:51:43 +02:00 |
|
galfour
|
b619fa1f17
|
further down the road
|
2019-09-18 18:49:33 +02:00 |
|
galfour
|
cdfffcf8ec
|
more refactoring
|
2019-09-10 12:42:49 +02:00 |
|