Commits · ef0b3736c8611496daae09a6c374cf8e4834fbc0 · Kirill Smelkov / slapos

26 May, 2015 1 commit
- old work-in-progress on building gitlab · ef0b3736
  Kirill Smelkov authored May 26, 2015
  
  ef0b3736
19 May, 2015 7 commits
- Merge branch 'kirr' · 2e7578b4
  Kirill Smelkov authored May 19, 2015
  
  2e7578b4
- ktest · 5016843f
  Kirill Smelkov authored May 19, 2015
  
  5016843f
- ktest · 1fd3c22c
  Kirill Smelkov authored May 19, 2015
  
  1fd3c22c
- Merge branch 'kirr' · 3e8560ca
  Kirill Smelkov authored May 19, 2015
  
  3e8560ca
- Merge branch 'kirr' · b0e3c7fb
  Kirill Smelkov authored May 19, 2015
```
Conflicts:
	buildout.cfg
```
  b0e3c7fb
- . · 182cdd55
  Kirill Smelkov authored May 19, 2015
  
  182cdd55
- . · a369dd7e
  Kirill Smelkov authored May 19, 2015
  
  a369dd7e